reverted removed WIN32 defines to fix MSVC2010 compilation