9 files changed, 30 insertions, 29 deletions
diff --git a/src/render/graphics.h b/src/render/graphics.h
index 5311c7bc6..36f3ed721 100644
--- a/src/render/graphics.h
+++ b/src/render/graphics.h
@@ -75,14 +75,14 @@
 
 #include "resources/mstack.h"
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wshadow")
+PRAGMA48(GCC diagnostic push)
+PRAGMA48(GCC diagnostic ignored "-Wshadow")
 #ifdef USE_SDL2
 #include <SDL_render.h>
 #else  // USE_SDL2
 #include <SDL_video.h>
 #endif  // USE_SDL2
-#pragma GCC diagnostic pop
+PRAGMA48(GCC diagnostic pop)
 
 #include "localconsts.h"
 
diff --git a/src/render/mobileopengl2graphics.h b/src/render/mobileopengl2graphics.h
index b5490df84..3148c5fd7 100644
--- a/src/render/mobileopengl2graphics.h
+++ b/src/render/mobileopengl2graphics.h
@@ -39,10 +39,10 @@
 #ifndef USE_SDL2
 #define GL_GLEXT_PROTOTYPES 1
 #endif  // USE_SDL2
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wshadow")
+PRAGMA48(GCC diagnostic push)
+PRAGMA48(GCC diagnostic ignored "-Wshadow")
 #include <SDL_opengl.h>
-#pragma GCC diagnostic pop
+PRAGMA48(GCC diagnostic pop)
 #if defined(__APPLE__)
 #include <OpenGL/glext.h>
 #elif !defined(__native_client__)
diff --git a/src/render/mobileopenglgraphics.h b/src/render/mobileopenglgraphics.h
index cdec3a0a5..7f4da86da 100644
--- a/src/render/mobileopenglgraphics.h
+++ b/src/render/mobileopenglgraphics.h
@@ -39,10 +39,10 @@
 #ifndef USE_SDL2
 #define GL_GLEXT_PROTOTYPES 1
 #endif  // USE_SDL2
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wshadow")
+PRAGMA48(GCC diagnostic push)
+PRAGMA48(GCC diagnostic ignored "-Wshadow")
 #include <SDL_opengl.h>
-#pragma GCC diagnostic pop
+PRAGMA48(GCC diagnostic pop)
 #if defined(__APPLE__)
 #include <OpenGL/glext.h>
 #elif !defined(__native_client__)
diff --git a/src/render/modernopenglgraphics.h b/src/render/modernopenglgraphics.h
index e13925234..f20acab1b 100644
--- a/src/render/modernopenglgraphics.h
+++ b/src/render/modernopenglgraphics.h
@@ -39,10 +39,10 @@
 #ifndef USE_SDL2
 #define GL_GLEXT_PROTOTYPES 1
 #endif  // USE_SDL2
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wshadow")
+PRAGMA48(GCC diagnostic push)
+PRAGMA48(GCC diagnostic ignored "-Wshadow")
 #include <SDL_opengl.h>
-#pragma GCC diagnostic pop
+PRAGMA48(GCC diagnostic pop)
 #if defined(__APPLE__)
 #include <OpenGL/glext.h>
 #elif !defined(__native_client__)
diff --git a/src/render/normalopenglgraphics.h b/src/render/normalopenglgraphics.h
index 92422590f..ee7ecd9ce 100644
--- a/src/render/normalopenglgraphics.h
+++ b/src/render/normalopenglgraphics.h
@@ -39,10 +39,10 @@
 #ifndef USE_SDL2
 #define GL_GLEXT_PROTOTYPES 1
 #endif  // USE_SDL2
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wshadow")
+PRAGMA48(GCC diagnostic push)
+PRAGMA48(GCC diagnostic ignored "-Wshadow")
 #include <SDL_opengl.h>
-#pragma GCC diagnostic pop
+PRAGMA48(GCC diagnostic pop)
 #if defined(__APPLE__)
 #include <OpenGL/glext.h>
 #elif !defined(__native_client__)
diff --git a/src/render/nullopenglgraphics.h b/src/render/nullopenglgraphics.h
index e968b1a4e..f496c0a35 100644
--- a/src/render/nullopenglgraphics.h
+++ b/src/render/nullopenglgraphics.h
@@ -39,10 +39,10 @@
 #ifndef USE_SDL2
 #define GL_GLEXT_PROTOTYPES 1
 #endif  // USE_SDL2
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wshadow")
+PRAGMA48(GCC diagnostic push)
+PRAGMA48(GCC diagnostic ignored "-Wshadow")
 #include <SDL_opengl.h>
-#pragma GCC diagnostic pop
+PRAGMA48(GCC diagnostic pop)
 #if defined(__APPLE__)
 #include <OpenGL/glext.h>
 #elif !defined(__native_client__)
diff --git a/src/render/opengl/mgltypes.h b/src/render/opengl/mgltypes.h
index 84cea09d3..2e76451f8 100644
--- a/src/render/opengl/mgltypes.h
+++ b/src/render/opengl/mgltypes.h
@@ -28,13 +28,14 @@
 #include <GLES/glext.h>
 #define APIENTRY GL_APIENTRY
 #else  // ANDROID
+#include "localconsts.h"
 #ifndef USE_SDL2
 #define GL_GLEXT_PROTOTYPES 1
 #endif  // USE_SDL2
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wshadow")
+PRAGMA48(GCC diagnostic push)
+PRAGMA48(GCC diagnostic ignored "-Wshadow")
 #include <SDL_opengl.h>
-#pragma GCC diagnostic pop
+PRAGMA48(GCC diagnostic pop)
 #ifdef __native_client__
 #include <GL/Regal.h>
 #else  // __native_client__
diff --git a/src/render/safeopenglgraphics.h b/src/render/safeopenglgraphics.h
index 692b39600..5c85ee058 100644
--- a/src/render/safeopenglgraphics.h
+++ b/src/render/safeopenglgraphics.h
@@ -36,10 +36,10 @@
 #ifndef USE_SDL2
 #define GL_GLEXT_PROTOTYPES 1
 #endif  // USE_SDL2
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wshadow")
+PRAGMA48(GCC diagnostic push)
+PRAGMA48(GCC diagnostic ignored "-Wshadow")
 #include <SDL_opengl.h>
-#pragma GCC diagnostic pop
+PRAGMA48(GCC diagnostic pop)
 #if defined(__APPLE__)
 #include <OpenGL/glext.h>
 #elif !defined(__native_client__)
diff --git a/src/render/vertexes/openglgraphicsvertexes.h b/src/render/vertexes/openglgraphicsvertexes.h
index 197b33584..5cd4bf098 100644
--- a/src/render/vertexes/openglgraphicsvertexes.h
+++ b/src/render/vertexes/openglgraphicsvertexes.h
@@ -23,22 +23,22 @@
 
 #ifdef USE_OPENGL
 
+#include "localconsts.h"
+
 #ifdef ANDROID
 #include <GLES/gl.h>
 #else  // ANDROID
 #ifndef USE_SDL2
 #define GL_GLEXT_PROTOTYPES 1
 #endif  // USE_SDL2
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wshadow")
+PRAGMA48(GCC diagnostic push)
+PRAGMA48(GCC diagnostic ignored "-Wshadow")
 #include <SDL_opengl.h>
-#pragma GCC diagnostic pop
+PRAGMA48(GCC diagnostic pop)
 #endif  // ANDROID
 
 #include <vector>
 
-#include "localconsts.h"
-
 class OpenGLGraphicsVertexes final
 {
     public: