summaryrefslogtreecommitdiff
path: root/src/render
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-06-20 01:02:22 +0300
committerAndrei Karas <akaras@inbox.ru>2017-06-20 01:02:22 +0300
commit132ee3146d10b6e6a860bfd7e03b5a8667f2a44b (patch)
tree0ef5bab643e4571ca77f4b4fa53276410edc0af2 /src/render
parent5d8285ae8d16b40cf842f2bafd41978e316ac9b8 (diff)
downloadmv-132ee3146d10b6e6a860bfd7e03b5a8667f2a44b.tar.gz
mv-132ee3146d10b6e6a860bfd7e03b5a8667f2a44b.tar.bz2
mv-132ee3146d10b6e6a860bfd7e03b5a8667f2a44b.tar.xz
mv-132ee3146d10b6e6a860bfd7e03b5a8667f2a44b.zip
Prevent Wshadow varnings in SDL code.
Diffstat (limited to 'src/render')
-rw-r--r--src/render/graphics.h3
-rw-r--r--src/render/mobileopengl2graphics.h3
-rw-r--r--src/render/mobileopenglgraphics.h3
-rw-r--r--src/render/modernopenglgraphics.h3
-rw-r--r--src/render/normalopenglgraphics.h3
-rw-r--r--src/render/nullopenglgraphics.h3
-rw-r--r--src/render/opengl/mgltypes.h3
-rw-r--r--src/render/safeopenglgraphics.h3
-rw-r--r--src/render/vertexes/openglgraphicsvertexes.h3
9 files changed, 27 insertions, 0 deletions
diff --git a/src/render/graphics.h b/src/render/graphics.h
index d0fabb997..5311c7bc6 100644
--- a/src/render/graphics.h
+++ b/src/render/graphics.h
@@ -75,11 +75,14 @@
#include "resources/mstack.h"
+#pragma GCC diagnostic push
+#pragma 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
#include "localconsts.h"
diff --git a/src/render/mobileopengl2graphics.h b/src/render/mobileopengl2graphics.h
index 3b88d1f93..b5490df84 100644
--- a/src/render/mobileopengl2graphics.h
+++ b/src/render/mobileopengl2graphics.h
@@ -39,7 +39,10 @@
#ifndef USE_SDL2
#define GL_GLEXT_PROTOTYPES 1
#endif // USE_SDL2
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow")
#include <SDL_opengl.h>
+#pragma 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 19055119d..cdec3a0a5 100644
--- a/src/render/mobileopenglgraphics.h
+++ b/src/render/mobileopenglgraphics.h
@@ -39,7 +39,10 @@
#ifndef USE_SDL2
#define GL_GLEXT_PROTOTYPES 1
#endif // USE_SDL2
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow")
#include <SDL_opengl.h>
+#pragma 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 f0fe630a6..e13925234 100644
--- a/src/render/modernopenglgraphics.h
+++ b/src/render/modernopenglgraphics.h
@@ -39,7 +39,10 @@
#ifndef USE_SDL2
#define GL_GLEXT_PROTOTYPES 1
#endif // USE_SDL2
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow")
#include <SDL_opengl.h>
+#pragma 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 d32ae57e6..92422590f 100644
--- a/src/render/normalopenglgraphics.h
+++ b/src/render/normalopenglgraphics.h
@@ -39,7 +39,10 @@
#ifndef USE_SDL2
#define GL_GLEXT_PROTOTYPES 1
#endif // USE_SDL2
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow")
#include <SDL_opengl.h>
+#pragma 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 78443de3c..e968b1a4e 100644
--- a/src/render/nullopenglgraphics.h
+++ b/src/render/nullopenglgraphics.h
@@ -39,7 +39,10 @@
#ifndef USE_SDL2
#define GL_GLEXT_PROTOTYPES 1
#endif // USE_SDL2
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow")
#include <SDL_opengl.h>
+#pragma 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 f55026859..84cea09d3 100644
--- a/src/render/opengl/mgltypes.h
+++ b/src/render/opengl/mgltypes.h
@@ -31,7 +31,10 @@
#ifndef USE_SDL2
#define GL_GLEXT_PROTOTYPES 1
#endif // USE_SDL2
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow")
#include <SDL_opengl.h>
+#pragma 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 e1830832d..692b39600 100644
--- a/src/render/safeopenglgraphics.h
+++ b/src/render/safeopenglgraphics.h
@@ -36,7 +36,10 @@
#ifndef USE_SDL2
#define GL_GLEXT_PROTOTYPES 1
#endif // USE_SDL2
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow")
#include <SDL_opengl.h>
+#pragma 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 646c29738..197b33584 100644
--- a/src/render/vertexes/openglgraphicsvertexes.h
+++ b/src/render/vertexes/openglgraphicsvertexes.h
@@ -29,7 +29,10 @@
#ifndef USE_SDL2
#define GL_GLEXT_PROTOTYPES 1
#endif // USE_SDL2
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow")
#include <SDL_opengl.h>
+#pragma GCC diagnostic pop
#endif // ANDROID
#include <vector>