From aa2eae5cab449ef8c728eb7b62d7ea46290332c5 Mon Sep 17 00:00:00 2001
From: Aaron Tomb <atomb@galois.com>
Date: Mon, 4 Nov 2013 14:28:32 -0800
Subject: Don't assume MSVC when __MINGW32__ set.

---
 src/misc/util/abc_global.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

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
-- 
cgit v1.2.3