Replace WIN32 preprocessor symbol by the official symbol _WIN32, used almost everywhere

This commit is contained in:
Simon Richter 2018-10-20 09:22:24 +02:00 committed by jean-pierre charras
parent 8a251163dc
commit abe1ffabda
5 changed files with 8 additions and 8 deletions

View File

@ -369,7 +369,7 @@ bool S3D_CACHE::getSHA1( const wxString& aFileName, unsigned char* aSHA1Sum )
return false;
}
#ifdef WIN32
#ifdef _WIN32
FILE* fp = _wfopen( aFileName.wc_str(), L"rb" );
#else
FILE* fp = fopen( aFileName.ToUTF8(), "rb" );

View File

@ -490,7 +490,7 @@ SCENEGRAPH* S3D_PLUGIN_MANAGER::Load3DModel( const wxString& aFileName, std::str
wxFileName raw( aFileName );
wxString ext = raw.GetExt();
#ifdef WIN32
#ifdef _WIN32
// note: plugins only have a lowercase filter within Windows; including an uppercase
// filter will result in duplicate file entries and should be avoided.
ext.LowerCase();

View File

@ -21,7 +21,7 @@
* @file streamwrapper.cpp
*/
#if !defined( WIN32 ) || !defined( __GNUC__ )
#if !defined( _WIN32 ) || !defined( __GNUC__ )
#error streamwrapper.cpp should not be included in this build
#endif

View File

@ -31,7 +31,7 @@
* Because we are before wx, we must explicitly define we are building with unicode.
* wxWidgets defaults to supporting unicode now, so this should be safe.
*/
#if defined(WIN32)
#if defined(_WIN32)
#ifndef UNICODE
# define UNICODE
#endif

View File

@ -27,7 +27,7 @@
#include <iostream>
#if defined( WIN32 ) && defined( __GNUC__ )
#if defined( _WIN32 ) && defined( __GNUC__ )
#include <ext/stdio_filebuf.h>
#define OSTREAM std::ostream
@ -73,7 +73,7 @@
}
#elif defined( _MSC_VER ) // defined( WIN32 ) && defined( __GNUC__ )
#elif defined( _MSC_VER ) // defined( _WIN32 ) && defined( __GNUC__ )
#define OSTREAM std::ofstream
@ -94,7 +94,7 @@
#define CLOSE_STREAM( var ) var.close()
#else // defined( WIN32 ) && defined( __GNUC__ )
#else // defined( _WIN32 ) && defined( __GNUC__ )
#define OSTREAM std::ofstream
@ -112,6 +112,6 @@
#define CLOSE_STREAM( var ) var.close()
#endif // defined( WIN32 ) && defined( __GNUC__ )
#endif // defined( _WIN32 ) && defined( __GNUC__ )
#endif // STREAMWRAPPER_H