diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-06-20 03:06:00 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-06-20 04:04:40 +0300 |
| commit | 5e37f24550e133d985945bb008782df543e1f428 (patch) | |
| tree | d32657fab845823be6a75bc743bdf6e8a357bcaa /src/resources/image | |
| parent | d3c69c839b180e1d22d5a89625322dfc6ae72785 (diff) | |
| download | manaverse-5e37f24550e133d985945bb008782df543e1f428.tar.gz manaverse-5e37f24550e133d985945bb008782df543e1f428.tar.bz2 manaverse-5e37f24550e133d985945bb008782df543e1f428.tar.xz manaverse-5e37f24550e133d985945bb008782df543e1f428.zip | |
Fix sdl warning hiding pragmas for old compilers.
Diffstat (limited to 'src/resources/image')
| -rw-r--r-- | src/resources/image/image.cpp | 6 | ||||
| -rw-r--r-- | src/resources/image/image.h | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/resources/image/image.cpp b/src/resources/image/image.cpp index 747609095..353f09fec 100644 --- a/src/resources/image/image.cpp +++ b/src/resources/image/image.cpp @@ -37,14 +37,14 @@ #include "utils/sdlcheckutils.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow") +PRAGMA48(GCC diagnostic push) +PRAGMA48(GCC diagnostic ignored "-Wshadow") #ifdef USE_SDL2 #include <SDL2_rotozoom.h> #else // USE_SDL2 #include <SDL_rotozoom.h> #endif // USE_SDL2 -#pragma GCC diagnostic pop +PRAGMA48(GCC diagnostic pop) #include "debug.h" diff --git a/src/resources/image/image.h b/src/resources/image/image.h index 8657eee2c..1da834bb1 100644 --- a/src/resources/image/image.h +++ b/src/resources/image/image.h @@ -37,21 +37,21 @@ #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 #endif // USE_OPENGL -#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 <map> |