16 files changed, 25 insertions, 17 deletions

diff --git a/cpp/src/FreezeScript/Grammar.y b/cpp/src/FreezeScript/Grammar.y
index 310ccf4d996..79f935cbb1f 100644
--- a/cpp/src/FreezeScript/Grammar.y
+++ b/cpp/src/FreezeScript/Grammar.y
@@ -11,7 +11,7 @@
 
 #include <FreezeScript/GrammarUtil.h>
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 // I get these warnings from some bison versions:
 // warning C4102: 'yyoverflowlab' : unreferenced label
 #   pragma warning( disable : 4102 )
diff --git a/cpp/src/FreezeScript/Scanner.l b/cpp/src/FreezeScript/Scanner.l
index 203841fba05..7756998a2bc 100644
--- a/cpp/src/FreezeScript/Scanner.l
+++ b/cpp/src/FreezeScript/Scanner.l
@@ -18,7 +18,7 @@
 
 #include <map>
 
-#ifdef _WIN32
+#ifdef _MSC_VER
     // I get these warnings from some flex versions:
     // warning C4003: not enough actual parameters for macro 'yywrap'
 #   pragma warning( disable : 4003 )
diff --git a/cpp/src/IceGrid/Grammar.y b/cpp/src/IceGrid/Grammar.y
index 75d6e5376e9..2b788edafa8 100644
--- a/cpp/src/IceGrid/Grammar.y
+++ b/cpp/src/IceGrid/Grammar.y
@@ -12,7 +12,7 @@
 #include <Ice/Ice.h>
 #include <IceGrid/Parser.h>
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 // I get these warnings from some bison versions:
 // warning C4102: 'yyoverflowlab' : unreferenced label
 #   pragma warning( disable : 4102 )
diff --git a/cpp/src/IceGrid/Parser.h b/cpp/src/IceGrid/Parser.h
index 42c16883d36..f72ab066b6f 100644
--- a/cpp/src/IceGrid/Parser.h
+++ b/cpp/src/IceGrid/Parser.h
@@ -20,7 +20,9 @@
 #   define isatty _isatty
 #   define fileno _fileno
 // '_isatty' : inconsistent dll linkage.  dllexport assumed.
-#   pragma warning( disable : 4273 )
+#   ifdef _MSC_VER
+#       pragma warning( disable : 4273 )
+#   endif
 #endif
 
 //
diff --git a/cpp/src/IceGrid/Scanner.l b/cpp/src/IceGrid/Scanner.l
index cbe7451d0d0..b68242503f8 100644
--- a/cpp/src/IceGrid/Scanner.l
+++ b/cpp/src/IceGrid/Scanner.l
@@ -13,7 +13,7 @@
 #include <IceGrid/Parser.h>
 #include <IceGrid/Grammar.h>
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 // I get these warnings from some flex versions:
 // warning C4003: not enough actual parameters for macro 'yywrap'
 #   pragma warning( disable : 4003 )
diff --git a/cpp/src/IcePack/Grammar.y b/cpp/src/IcePack/Grammar.y
index a023c17ce83..04312e088bf 100644
--- a/cpp/src/IcePack/Grammar.y
+++ b/cpp/src/IcePack/Grammar.y
@@ -12,7 +12,7 @@
 #include <Ice/Ice.h>
 #include <IcePack/Parser.h>
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 // I get these warnings from some bison versions:
 // warning C4102: 'yyoverflowlab' : unreferenced label
 #   pragma warning( disable : 4102 )
diff --git a/cpp/src/IcePack/Parser.h b/cpp/src/IcePack/Parser.h
index 3baa65954bc..412deff5062 100644
--- a/cpp/src/IcePack/Parser.h
+++ b/cpp/src/IcePack/Parser.h
@@ -20,7 +20,9 @@
 #   define isatty _isatty
 #   define fileno _fileno
 // '_isatty' : inconsistent dll linkage.  dllexport assumed.
-#   pragma warning( disable : 4273 )
+#   ifdef _MSC_VER
+#       pragma warning( disable : 4273 )
+#   endif
 #endif
 
 //
diff --git a/cpp/src/IcePack/Scanner.l b/cpp/src/IcePack/Scanner.l
index bd8f650e5d9..3c1765f7b61 100644
--- a/cpp/src/IcePack/Scanner.l
+++ b/cpp/src/IcePack/Scanner.l
@@ -13,7 +13,7 @@
 #include <IcePack/Parser.h>
 #include <IcePack/Grammar.h>
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 // I get these warnings from some flex versions:
 // warning C4003: not enough actual parameters for macro 'yywrap'
 #   pragma warning( disable : 4003 )
diff --git a/cpp/src/IceStorm/Grammar.y b/cpp/src/IceStorm/Grammar.y
index c7fceec3505..1fb6d97ba64 100644
--- a/cpp/src/IceStorm/Grammar.y
+++ b/cpp/src/IceStorm/Grammar.y
@@ -12,7 +12,7 @@
 #include <Ice/Ice.h>
 #include <IceStorm/Parser.h>
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 // I get these warnings from some bison versions:
 // warning C4102: 'yyoverflowlab' : unreferenced label
 #   pragma warning( disable : 4102 )
diff --git a/cpp/src/IceStorm/Parser.h b/cpp/src/IceStorm/Parser.h
index 1c0e6cb3b97..9f41a47bb03 100644
--- a/cpp/src/IceStorm/Parser.h
+++ b/cpp/src/IceStorm/Parser.h
@@ -19,7 +19,9 @@
 #   define isatty _isatty
 #   define fileno _fileno
 // '_isatty' : inconsistent dll linkage.  dllexport assumed.
-#   pragma warning( disable : 4273 )
+#   ifdef _MSC_VER
+#       pragma warning( disable : 4273 )
+#   endif
 #endif
 
 //
diff --git a/cpp/src/IceStorm/Scanner.l b/cpp/src/IceStorm/Scanner.l
index cbc3d003dad..e93debacfa7 100644
--- a/cpp/src/IceStorm/Scanner.l
+++ b/cpp/src/IceStorm/Scanner.l
@@ -13,7 +13,7 @@
 #include <IceStorm/Parser.h>
 #include <IceStorm/Grammar.h>
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 // I get these warnings from some flex versions:
 // warning C4003: not enough actual parameters for macro 'yywrap'
 #   pragma warning( disable : 4003 )
diff --git a/cpp/src/IceStorm/WeightedGraph.cpp b/cpp/src/IceStorm/WeightedGraph.cpp
index 2a6eb94ee3c..1a383578b54 100644
--- a/cpp/src/IceStorm/WeightedGraph.cpp
+++ b/cpp/src/IceStorm/WeightedGraph.cpp
@@ -20,7 +20,7 @@ using namespace IceStorm;
 namespace IceStorm
 {
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 #    pragma warning(disable:4786)
 #endif
 
diff --git a/cpp/src/Slice/Grammar.y b/cpp/src/Slice/Grammar.y
index a3f12a11242..b0340cd4aca 100644
--- a/cpp/src/Slice/Grammar.y
+++ b/cpp/src/Slice/Grammar.y
@@ -12,7 +12,7 @@
 #include <Slice/GrammarUtil.h>
 #include <IceUtil/UUID.h>
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 // I get these warnings from some bison versions:
 // warning C4102: 'yyoverflowlab' : unreferenced label
 #   pragma warning( disable : 4102 )
diff --git a/cpp/src/Slice/Scanner.l b/cpp/src/Slice/Scanner.l
index 101d87e108a..5487e8d4601 100644
--- a/cpp/src/Slice/Scanner.l
+++ b/cpp/src/Slice/Scanner.l
@@ -16,7 +16,7 @@
 #include <stdlib.h>
 #include <math.h>
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 // I get these warnings from some flex versions:
 // warning C4003: not enough actual parameters for macro 'yywrap'
 #   pragma warning( disable : 4003 )
diff --git a/cpp/src/icecpp/cexp.y b/cpp/src/icecpp/cexp.y
index ca4de3d6359..370c61b910a 100644
--- a/cpp/src/icecpp/cexp.y
+++ b/cpp/src/icecpp/cexp.y
@@ -109,7 +109,7 @@ struct arglist {
 #define HOST_BITS_PER_WIDE_INT (CHAR_BIT * sizeof (HOST_WIDE_INT))
 #endif
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 // I get these warnings from some bison versions:
 // warning C4102: 'yyoverflowlab' : unreferenced label
 #   pragma warning( disable : 4102 )
diff --git a/cpp/src/icecpp/config.h b/cpp/src/icecpp/config.h
index 2922517058d..5eacee9d5f1 100644
--- a/cpp/src/icecpp/config.h
+++ b/cpp/src/icecpp/config.h
@@ -26,8 +26,10 @@
 #elif defined(_WIN32)
 #   include <malloc.h>
 #   include <io.h>
-#   pragma warning( disable : 4018 )
-#   pragma warning( disable : 4244 )
+#   ifdef _MSC_VER
+#       pragma warning( disable : 4018 )
+#       pragma warning( disable : 4244 )
+#   endif
 #   define alloca _alloca
 #endif