fixed the other win32 ifdefs
Merge pull request #18 from allenhux/master

fixed the other win32 ifdefs