Merge "Stop defining WIN32."