Don't assume MSVC when __MINGW32__ set.

This commit is contained in:
Aaron Tomb 2013-11-04 14:28:32 -08:00
parent 6a4d430e60
commit aa2eae5cab
1 changed files with 2 additions and 0 deletions

View File

@ -26,6 +26,7 @@
////////////////////////////////////////////////////////////////////////
#ifdef _WIN32
#ifndef __MINGW32__
#define inline __inline // compatible with MS VS 6.0
#pragma warning(disable : 4152) // warning C4152: nonstandard extension, function/data pointer conversion in expression
#pragma warning(disable : 4200) // warning C4200: nonstandard extension used : zero-sized array in struct/union
@ -34,6 +35,7 @@
#pragma warning(disable : 4710) // warning C4710: function 'Vec_PtrGrow' not inlined
//#pragma warning( disable : 4273 )
#endif
#endif
#ifdef WIN32
#ifdef WIN32_NO_DLL