diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-06-20 01:02:22 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-06-20 01:02:22 +0300 |
| commit | 132ee3146d10b6e6a860bfd7e03b5a8667f2a44b (patch) | |
| tree | 0ef5bab643e4571ca77f4b4fa53276410edc0af2 /src/client.cpp | |
| parent | 5d8285ae8d16b40cf842f2bafd41978e316ac9b8 (diff) | |
| download | manaplus-132ee3146d10b6e6a860bfd7e03b5a8667f2a44b.tar.gz manaplus-132ee3146d10b6e6a860bfd7e03b5a8667f2a44b.tar.bz2 manaplus-132ee3146d10b6e6a860bfd7e03b5a8667f2a44b.tar.xz manaplus-132ee3146d10b6e6a860bfd7e03b5a8667f2a44b.zip | |
Prevent Wshadow varnings in SDL code.
Diffstat (limited to 'src/client.cpp')
| -rw-r--r-- | src/client.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/client.cpp b/src/client.cpp index 2bce1bad6..68fdeaca9 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -168,14 +168,20 @@ #endif // USE_OPENGL #ifdef WIN32 +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wshadow") #include <SDL_syswm.h> +#pragma GCC diagnostic pop #include "fs/specialfolder.h" #undef ERROR #endif // WIN32 #ifdef ANDROID #ifndef USE_SDL2 +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wshadow") #include <SDL_screenkeyboard.h> +#pragma GCC diagnostic pop #include <fstream> #endif // USE_SDL2 #endif // ANDROID @@ -186,11 +192,14 @@ #include "mumblemanager.h" #endif // USE_MUMBLE +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wshadow") #ifdef USE_SDL2 #include <SDL2_framerate.h> #else // USE_SDL2 #include <SDL_framerate.h> #endif // USE_SDL2 +#pragma GCC diagnostic pop #include "debug.h" |