Fixed #5195: compiled ok on windows
Fixed #5195: compiled ok on android
Merge pull request #392 from joshuastray/master

Fixed #5195: fix compiling issue with -x update