diff options
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/fboinfo.h | 10 | ||||
| -rw-r--r-- | src/resources/image/image.h | 7 | ||||
| -rw-r--r-- | src/resources/openglimagehelper.h | 7 | ||||
| -rw-r--r-- | src/resources/safeopenglimagehelper.h | 7 |
4 files changed, 31 insertions, 0 deletions
diff --git a/src/resources/fboinfo.h b/src/resources/fboinfo.h index 5f47630c1..5dd3dbef0 100644 --- a/src/resources/fboinfo.h +++ b/src/resources/fboinfo.h @@ -34,10 +34,17 @@ #endif // HAVE_GLEXT PRAGMA48(GCC diagnostic push) PRAGMA48(GCC diagnostic ignored "-Wshadow") +// ignore -Wredundant-decls for SDL 1.2 +PRAGMA45(GCC diagnostic push) +PRAGMA45(GCC diagnostic ignored "-Wredundant-decls") #include <SDL_opengl.h> +PRAGMA45(GCC diagnostic pop) PRAGMA48(GCC diagnostic pop) #ifdef HAVE_GLEXT +PRAGMA45(GCC diagnostic push) +PRAGMA45(GCC diagnostic ignored "-Wredundant-decls") #include <GL/glext.h> +PRAGMA45(GCC diagnostic pop) #endif // HAVE_GLEXT #if defined(__APPLE__) #include <OpenGL/glext.h> @@ -46,7 +53,10 @@ PRAGMA48(GCC diagnostic pop) #ifdef GL_GLEXT_VERSION #undef GL_GLEXT_VERSION #endif +PRAGMA45(GCC diagnostic push) +PRAGMA45(GCC diagnostic ignored "-Wredundant-decls") #include <GL/glext.h> +PRAGMA45(GCC diagnostic pop) #endif // defined(__APPLE__) #endif // ANDROID diff --git a/src/resources/image/image.h b/src/resources/image/image.h index b15ff7d33..c8b1e9150 100644 --- a/src/resources/image/image.h +++ b/src/resources/image/image.h @@ -42,10 +42,17 @@ #endif // HAVE_GLEXT PRAGMA48(GCC diagnostic push) PRAGMA48(GCC diagnostic ignored "-Wshadow") +// ignore -Wredundant-decls for SDL 1.2 +PRAGMA45(GCC diagnostic push) +PRAGMA45(GCC diagnostic ignored "-Wredundant-decls") #include <SDL_opengl.h> +PRAGMA45(GCC diagnostic pop) PRAGMA48(GCC diagnostic pop) #ifdef HAVE_GLEXT +PRAGMA45(GCC diagnostic push) +PRAGMA45(GCC diagnostic ignored "-Wredundant-decls") #include <GL/glext.h> +PRAGMA45(GCC diagnostic pop) #endif // HAVE_GLEXT #endif // ANDROID #endif // USE_OPENGL diff --git a/src/resources/openglimagehelper.h b/src/resources/openglimagehelper.h index 173f53bb7..a14956ac7 100644 --- a/src/resources/openglimagehelper.h +++ b/src/resources/openglimagehelper.h @@ -46,10 +46,17 @@ #endif // HAVE_GLEXT PRAGMA48(GCC diagnostic push) PRAGMA48(GCC diagnostic ignored "-Wshadow") +// ignore -Wredundant-decls for SDL 1.2 +PRAGMA45(GCC diagnostic push) +PRAGMA45(GCC diagnostic ignored "-Wredundant-decls") #include <SDL_opengl.h> +PRAGMA45(GCC diagnostic pop) PRAGMA48(GCC diagnostic pop) #ifdef HAVE_GLEXT +PRAGMA45(GCC diagnostic push) +PRAGMA45(GCC diagnostic ignored "-Wredundant-decls") #include <GL/glext.h> +PRAGMA45(GCC diagnostic pop) #endif // HAVE_GLEXT #endif // ANDROID diff --git a/src/resources/safeopenglimagehelper.h b/src/resources/safeopenglimagehelper.h index 7b2098b11..31ff4dac4 100644 --- a/src/resources/safeopenglimagehelper.h +++ b/src/resources/safeopenglimagehelper.h @@ -46,10 +46,17 @@ #endif // HAVE_GLEXT PRAGMA48(GCC diagnostic push) PRAGMA48(GCC diagnostic ignored "-Wshadow") +// ignore -Wredundant-decls for SDL 1.2 +PRAGMA45(GCC diagnostic push) +PRAGMA45(GCC diagnostic ignored "-Wredundant-decls") #include <SDL_opengl.h> +PRAGMA45(GCC diagnostic pop) PRAGMA48(GCC diagnostic pop) #ifdef HAVE_GLEXT +PRAGMA45(GCC diagnostic push) +PRAGMA45(GCC diagnostic ignored "-Wredundant-decls") #include <GL/glext.h> +PRAGMA45(GCC diagnostic pop) #endif // HAVE_GLEXT #endif // ANDROID |