Win32 BuildFix.
Merge pull request #4945 from shenweip/patch-17

Win32 BuildFix.