Fix Clang's pragmas

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
 

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
 

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
 

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);

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
 

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;
 	

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;