Skip to content

A
abc
Commit aa2eae5c by Aaron Tomb
Options

Don't assume MSVC when __MINGW32__ set.

parent 6a4d430e
Showing with 2 additions and 0 deletions
src/misc/util/abc_global.h
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
#ifdef _WIN32 #ifdef _WIN32
#ifndef __MINGW32__
#define inline __inline // compatible with MS VS 6.0 #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 : 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 #pragma warning(disable : 4200) // warning C4200: nonstandard extension used : zero-sized array in struct/union
...@@ -34,6 +35,7 @@ ...@@ -34,6 +35,7 @@
#pragma warning(disable : 4710) // warning C4710: function 'Vec_PtrGrow' not inlined #pragma warning(disable : 4710) // warning C4710: function 'Vec_PtrGrow' not inlined
//#pragma warning( disable : 4273 ) //#pragma warning( disable : 4273 )
#endif #endif
#endif
#ifdef WIN32 #ifdef WIN32
#ifdef WIN32_NO_DLL #ifdef WIN32_NO_DLL
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment