Eliminate all usage of WIN32 macro as well: _WIN32 is the portable macro.
Eliminate all usage of WIN32 macro as well: _WIN32 is the portable macro.
merge-mark