From 132ee3146d10b6e6a860bfd7e03b5a8667f2a44b Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 20 Jun 2017 01:02:22 +0300 Subject: Prevent Wshadow varnings in SDL code. --- src/client.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/client.cpp') 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 +#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 +#pragma GCC diagnostic pop #include #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 #else // USE_SDL2 #include #endif // USE_SDL2 +#pragma GCC diagnostic pop #include "debug.h" -- cgit v1.2.3-60-g2f50