diff options
| author | Aaron Tomb <atomb@galois.com> | 2013-11-04 14:28:32 -0800 |
|---|---|---|
| committer | Aaron Tomb <atomb@galois.com> | 2013-11-04 14:28:32 -0800 |
| commit | aa2eae5cab449ef8c728eb7b62d7ea46290332c5 (patch) | |
| tree | af603fc7cf0ffa5b0e9696e1285fe374baea60c6 /src | |
| parent | 6a4d430e608fe1d2f8a72fdb682de1d163c641fe (diff) | |
| download | abc-aa2eae5cab449ef8c728eb7b62d7ea46290332c5.tar.gz abc-aa2eae5cab449ef8c728eb7b62d7ea46290332c5.tar.bz2 abc-aa2eae5cab449ef8c728eb7b62d7ea46290332c5.zip | |
Don't assume MSVC when __MINGW32__ set.
Diffstat (limited to 'src')
| -rw-r--r-- | src/misc/util/abc_global.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/misc/util/abc_global.h b/src/misc/util/abc_global.h index 5a0a1f1d..144177da 100644 --- a/src/misc/util/abc_global.h +++ b/src/misc/util/abc_global.h @@ -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 |