diff --git a/src/celengine/command.h b/src/celengine/command.h
index 12be3172c..14f9970d5 100644
--- a/src/celengine/command.h
+++ b/src/celengine/command.h
@@ -18,7 +18,7 @@
 #include <celengine/astro.h>
 
 
-#ifndef _MSC_VER
+#ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunused-private-field"
 #endif
@@ -692,7 +692,7 @@ class RepeatCommand : public Command
 };
 
 
-#ifndef _MSC_VER
+#ifdef __clang__
 #pragma clang diagnostic pop
 #endif
 
diff --git a/src/celengine/model.h b/src/celengine/model.h
index c76a0e747..8e3f4d629 100644
--- a/src/celengine/model.h
+++ b/src/celengine/model.h
@@ -46,7 +46,7 @@ public:
 };
 
 
-#ifndef _MSC_VER
+#ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunused-private-field"
 #endif
@@ -185,7 +185,7 @@ class Model : public Geometry
     bool normalized;
 };
 
-#ifndef _MSC_VER
+#ifdef __clang__
 #pragma clang diagnostic pop
 #endif
 
diff --git a/src/celengine/octree.h b/src/celengine/octree.h
index da1c3a664..65f41f8d6 100644
--- a/src/celengine/octree.h
+++ b/src/celengine/octree.h
@@ -18,7 +18,7 @@
 #include <celengine/observer.h>
 
 
-#ifndef _MSC_VER
+#ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wundefined-var-template"
 #endif
@@ -383,7 +383,7 @@ void StaticOctree<OBJ, PREC>::computeStatistics(std::vector<OctreeLevelStatistic
     }
 }
 
-#ifndef _MSC_VER
+#ifdef __clang__
 #pragma clang diagnostic pop
 #endif
 
diff --git a/src/celengine/render.cpp b/src/celengine/render.cpp
index 268fdb0ab..96625ba58 100644
--- a/src/celengine/render.cpp
+++ b/src/celengine/render.cpp
@@ -10541,9 +10541,9 @@ void Renderer::renderAnnotations(const vector<Annotation>& annotations, FontStyl
                 break;
             }
 
-#ifndef _MSC_VER
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wenum-compare-switch"
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wenum-compare-switch"
 #endif
             switch (annotations[i].valign)
             {
@@ -10557,8 +10557,8 @@ void Renderer::renderAnnotations(const vector<Annotation>& annotations, FontStyl
                 vOffset = 0;
                 break;
             }
-#ifndef _MSC_VER
-#pragma GCC diagnostic pop
+#ifdef __clang__
+#pragma clang diagnostic pop
 #endif
 
             glColor(annotations[i].color);
diff --git a/src/celengine/vertexprog.h b/src/celengine/vertexprog.h
index 6b482b2e0..221dc48dc 100644
--- a/src/celengine/vertexprog.h
+++ b/src/celengine/vertexprog.h
@@ -96,7 +96,7 @@ namespace arbvp
 };
 
 
-#ifndef _MSC_VER
+#ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunused-private-field"
 #endif
@@ -126,7 +126,7 @@ class VertexProcessor
  private:
     int dummy;
 };
-#ifndef _MSC_VER
+#ifdef __clang__
 #pragma clang diagnostic pop
 #endif
 
diff --git a/src/celestia/gtk/dialog-solar.cpp b/src/celestia/gtk/dialog-solar.cpp
index 4079970a9..59faca7ba 100644
--- a/src/celestia/gtk/dialog-solar.cpp
+++ b/src/celestia/gtk/dialog-solar.cpp
@@ -104,10 +104,14 @@ static void treeSolarSelect(GtkTreeSelection* sel, AppData* app)
 {
 	gpointer item;
 	gint type;
+#ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wmissing-braces"
+#endif
 	GValue value = { 0, 0 }; /* Initialize empty GValue */
+#ifdef __clang__
 #pragma clang diagnostic pop
+#endif
 	GtkTreeIter iter;
 	GtkTreeModel* model;
 	
diff --git a/src/celestia/gtk/dialog-star.cpp b/src/celestia/gtk/dialog-star.cpp
index 43db899c1..a17ada2b8 100644
--- a/src/celestia/gtk/dialog-star.cpp
+++ b/src/celestia/gtk/dialog-star.cpp
@@ -159,10 +159,14 @@ void dialogStarBrowser(AppData* app)
 /* CALLBACK: When Star is selected in Star Browser */
 static void listStarSelect(GtkTreeSelection* sel, AppData* app)
 {
+#ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wmissing-braces"
+#endif
 	GValue value = { 0, 0 }; /* Initialize GValue to 0 */
+#ifdef __clang__
 #pragma clang diagnostic pop
+#endif
 	GtkTreeIter iter;
 	GtkTreeModel* model;