Merge pull request #1392 from Azaezel/C4005

warning C4005: 'WIN32' : macro redefinition
This commit is contained in:
Areloch 2015-08-07 23:03:07 -05:00
commit 196bc67720

View file

@ -28,9 +28,9 @@
#include "console/engineAPI.h"
// define macros required for ConvexDecomp headers
#if defined( _WIN32 )
#if defined( _WIN32 ) && !defined( WIN32 )
#define WIN32
#elif defined( __MACOSX__ )
#elif defined( __MACOSX__ ) && !defined( APPLE )
#define APPLE
#endif