Fixing Windows build, round 2.
Fixing Windows build, round 2.


hoangchunghien/sfntwari,soimort/sfntwari,soimort/sfntwari,hoangchunghien/sfntwari,soimort/sfntwari,hoangchunghien/sfntwari,hoangchunghien/sfntwari,soimort/sfntwari