WIN32 portability changes

2 files changed