Merge "Change preprocessor check to _WIN32"