diff options
| author | Andrei Karas <akaras@inbox.ru> | 2020-11-27 05:36:42 +0300 |
|---|---|---|
| committer | jak1 <mike.wollmann@gmail.com> | 2021-03-11 20:57:13 +0000 |
| commit | 7124d95d082d77b7e00447a4ecad094e575e8fa9 (patch) | |
| tree | c609a913d6ac659e08b1b6d81446e4af984773d2 /src/render/opengl/mgltypes.h | |
| parent | 54b88d05bbbe616c05814d57cc4f86de649ce98c (diff) | |
| download | plus-7124d95d082d77b7e00447a4ecad094e575e8fa9.tar.gz plus-7124d95d082d77b7e00447a4ecad094e575e8fa9.tar.bz2 plus-7124d95d082d77b7e00447a4ecad094e575e8fa9.tar.xz plus-7124d95d082d77b7e00447a4ecad094e575e8fa9.zip | |
Silence warning -Wredundant-decls in SDL 1.2 code
Also switch in debug build script to gcc 10.
Diffstat (limited to 'src/render/opengl/mgltypes.h')
| -rw-r--r-- | src/render/opengl/mgltypes.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/render/opengl/mgltypes.h b/src/render/opengl/mgltypes.h index 874e4c9ff..bf5a34fc7 100644 --- a/src/render/opengl/mgltypes.h +++ b/src/render/opengl/mgltypes.h @@ -37,10 +37,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 #ifdef __native_client__ #include <GL/Regal.h> @@ -50,7 +57,10 @@ PRAGMA48(GCC diagnostic pop) #else // defined(__APPLE__) #ifndef __glext_h_ // probably this include need for some os / libs +PRAGMA45(GCC diagnostic push) +PRAGMA45(GCC diagnostic ignored "-Wredundant-decls") #include <GL/glext.h> +PRAGMA45(GCC diagnostic pop) // #error missing include <GL/glext.h> #endif // __glext_h_ #endif // defined(__APPLE__) |