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/dyetool | |
| 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/dyetool')
| -rw-r--r-- | src/dyetool/client.cpp | 9 | ||||
| -rw-r--r-- | src/dyetool/dyemain.cpp | 3 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/dyetool/client.cpp b/src/dyetool/client.cpp index 0d01e17d4..912494b99 100644 --- a/src/dyetool/client.cpp +++ b/src/dyetool/client.cpp @@ -78,7 +78,10 @@ #include "net/ipc.h" #ifdef WIN32 +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wshadow") #include <SDL_syswm.h> +#pragma GCC diagnostic pop #include <sys/time.h> #include "fs/specialfolder.h" #undef ERROR @@ -86,16 +89,22 @@ #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 +#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" diff --git a/src/dyetool/dyemain.cpp b/src/dyetool/dyemain.cpp index 11138e39a..f23019bef 100644 --- a/src/dyetool/dyemain.cpp +++ b/src/dyetool/dyemain.cpp @@ -44,7 +44,10 @@ #include "resources/sdlimagehelper.h" #endif // USE_SDL2 +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wshadow") #include <SDL.h> +#pragma GCC diagnostic pop #include "debug.h" |