From 5e37f24550e133d985945bb008782df543e1f428 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 20 Jun 2017 03:06:00 +0300
Subject: Fix sdl warning hiding pragmas for old compilers.

---
 src/utils/buildhex.h            |  6 +++---
 src/utils/chatutils_unittest.cc |  6 +++---
 src/utils/copynpaste.cpp        | 18 +++++++++---------
 src/utils/dumplibs.cpp          |  6 +++---
 src/utils/dumplibs_unittest.cc  |  6 +++---
 src/utils/process.cpp           | 12 ++++++------
 src/utils/sdl2helper.cpp        |  6 +++---
 src/utils/sdl2helper.h          |  6 +++---
 src/utils/sdlcheckutils.cpp     |  6 +++---
 src/utils/sdlhelper.cpp         |  6 +++---
 src/utils/sdlhelper.h           | 10 +++++-----
 src/utils/sdlpixel.h            |  6 +++---
 src/utils/sdlsharedhelper.cpp   |  6 +++---
 src/utils/timer.cpp             |  6 +++---
 14 files changed, 53 insertions(+), 53 deletions(-)

(limited to 'src/utils')

diff --git a/src/utils/buildhex.h b/src/utils/buildhex.h
index cf9ab4591..0a4349bac 100644
--- a/src/utils/buildhex.h
+++ b/src/utils/buildhex.h
@@ -23,12 +23,12 @@
 
 #include "localconsts.h"
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wshadow")
+PRAGMA48(GCC diagnostic push)
+PRAGMA48(GCC diagnostic ignored "-Wshadow")
 #ifndef SDL_BIG_ENDIAN
 #include <SDL_endian.h>
 #endif  // SDL_BYTEORDER
-#pragma GCC diagnostic pop
+PRAGMA48(GCC diagnostic pop)
 
 #if SDL_BYTEORDER == SDL_BIG_ENDIAN
 #define buildHex(a, b, c, d) \
diff --git a/src/utils/chatutils_unittest.cc b/src/utils/chatutils_unittest.cc
index b6e735d75..b63bf87ad 100644
--- a/src/utils/chatutils_unittest.cc
+++ b/src/utils/chatutils_unittest.cc
@@ -46,12 +46,12 @@
 
 #include "resources/resourcemanager/resourcemanager.h"
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wshadow")
+PRAGMA48(GCC diagnostic push)
+PRAGMA48(GCC diagnostic ignored "-Wshadow")
 #ifndef USE_SDL2
 #include <SDL.h>
 #endif  // USE_SDL2
-#pragma GCC diagnostic pop
+PRAGMA48(GCC diagnostic pop)
 
 #include "debug.h"
 
diff --git a/src/utils/copynpaste.cpp b/src/utils/copynpaste.cpp
index 0fdbf0652..58c191a3d 100644
--- a/src/utils/copynpaste.cpp
+++ b/src/utils/copynpaste.cpp
@@ -38,10 +38,10 @@
 #include "debug.h"
 
 #ifdef USE_SDL2
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wshadow")
+PRAGMA48(GCC diagnostic push)
+PRAGMA48(GCC diagnostic ignored "-Wshadow")
 #include <SDL_clipboard.h>
-#pragma GCC diagnostic pop
+PRAGMA48(GCC diagnostic pop)
 
 #else  // USE_SDL2
 
@@ -55,18 +55,18 @@
 
 #include "utils/sdlhelper.h"
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wshadow")
+PRAGMA48(GCC diagnostic push)
+PRAGMA48(GCC diagnostic ignored "-Wshadow")
 #include <SDL_syswm.h>
-#pragma GCC diagnostic pop
+PRAGMA48(GCC diagnostic pop)
 #include <unistd.h>
 #elif defined __native_client__
 #include "utils/naclmessages.h"
 #elif defined WIN32
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wshadow")
+PRAGMA48(GCC diagnostic push)
+PRAGMA48(GCC diagnostic ignored "-Wshadow")
 #include <SDL_syswm.h>
-#pragma GCC diagnostic pop
+PRAGMA48(GCC diagnostic pop)
 #endif  // defined(__APPLE__)
 
 #endif  // USE_SDL2
diff --git a/src/utils/dumplibs.cpp b/src/utils/dumplibs.cpp
index d1f87f987..420ef62ce 100644
--- a/src/utils/dumplibs.cpp
+++ b/src/utils/dumplibs.cpp
@@ -25,8 +25,8 @@
 #include "utils/stringutils.h"
 
 #include <png.h>
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wshadow")
+PRAGMA48(GCC diagnostic push)
+PRAGMA48(GCC diagnostic ignored "-Wshadow")
 #include <SDL_image.h>
 #include <SDL_mixer.h>
 PRAGMACLANG6GCC(GCC diagnostic push)
@@ -34,7 +34,7 @@ PRAGMACLANG6GCC(GCC diagnostic ignored "-Wold-style-cast")
 #include <SDL_net.h>
 PRAGMACLANG6GCC(GCC diagnostic pop)
 #include <SDL_ttf.h>
-#pragma GCC diagnostic pop
+PRAGMA48(GCC diagnostic pop)
 
 #include <zlib.h>
 
diff --git a/src/utils/dumplibs_unittest.cc b/src/utils/dumplibs_unittest.cc
index eb163aa7b..7c64911e3 100644
--- a/src/utils/dumplibs_unittest.cc
+++ b/src/utils/dumplibs_unittest.cc
@@ -25,8 +25,8 @@
 #include "utils/delete2.h"
 #include "utils/stringutils.h"
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wshadow")
+PRAGMA48(GCC diagnostic push)
+PRAGMA48(GCC diagnostic ignored "-Wshadow")
 #include <SDL_image.h>
 #include <SDL_mixer.h>
 PRAGMACLANG6GCC(GCC diagnostic push)
@@ -34,7 +34,7 @@ PRAGMACLANG6GCC(GCC diagnostic ignored "-Wold-style-cast")
 #include <SDL_net.h>
 PRAGMACLANG6GCC(GCC diagnostic pop)
 #include <SDL_ttf.h>
-#pragma GCC diagnostic pop
+PRAGMA48(GCC diagnostic pop)
 
 #include <zlib.h>
 
diff --git a/src/utils/process.cpp b/src/utils/process.cpp
index e79b8e3b7..c4639e4db 100644
--- a/src/utils/process.cpp
+++ b/src/utils/process.cpp
@@ -24,14 +24,14 @@
 
 #include "localconsts.h"
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wshadow")
+PRAGMA48(GCC diagnostic push)
+PRAGMA48(GCC diagnostic ignored "-Wshadow")
 #ifdef USE_SDL2
 #ifdef ANDROID
 #include <SDL_system.h>
 #endif  // ANDROID
 #endif  // USE_SDL2
-#pragma GCC diagnostic pop
+PRAGMA48(GCC diagnostic pop)
 
 #include "debug.h"
 
@@ -261,10 +261,10 @@ bool openBrowser(std::string url)
 #elif defined ANDROID
 #include "utils/stringutils.h"
 #ifndef USE_SDL2
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wshadow")
+PRAGMA48(GCC diagnostic push)
+PRAGMA48(GCC diagnostic ignored "-Wshadow")
 #include <SDL_screenkeyboard.h>
-#pragma GCC diagnostic pop
+PRAGMA48(GCC diagnostic pop)
 #endif  // USE_SDL2
 
 bool openBrowser(std::string url)
diff --git a/src/utils/sdl2helper.cpp b/src/utils/sdl2helper.cpp
index 97ff70f3a..239f2636b 100644
--- a/src/utils/sdl2helper.cpp
+++ b/src/utils/sdl2helper.cpp
@@ -26,10 +26,10 @@
 
 #include "utils/stringutils.h"
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wshadow")
+PRAGMA48(GCC diagnostic push)
+PRAGMA48(GCC diagnostic ignored "-Wshadow")
 #include <SDL_syswm.h>
-#pragma GCC diagnostic pop
+PRAGMA48(GCC diagnostic pop)
 
 #include "debug.h"
 
diff --git a/src/utils/sdl2helper.h b/src/utils/sdl2helper.h
index 1d809a781..70d3ffa90 100644
--- a/src/utils/sdl2helper.h
+++ b/src/utils/sdl2helper.h
@@ -26,10 +26,10 @@
 
 #include "localconsts.h"
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wshadow")
+PRAGMA48(GCC diagnostic push)
+PRAGMA48(GCC diagnostic ignored "-Wshadow")
 #include <SDL_thread.h>
-#pragma GCC diagnostic pop
+PRAGMA48(GCC diagnostic pop)
 
 struct SDL_Surface;
 struct SDL_SysWMinfo;
diff --git a/src/utils/sdlcheckutils.cpp b/src/utils/sdlcheckutils.cpp
index 86e5363b0..4ce07f2e5 100644
--- a/src/utils/sdlcheckutils.cpp
+++ b/src/utils/sdlcheckutils.cpp
@@ -29,11 +29,11 @@
 
 #include <map>
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wshadow")
+PRAGMA48(GCC diagnostic push)
+PRAGMA48(GCC diagnostic ignored "-Wshadow")
 #include <SDL_image.h>
 #include <SDL_ttf.h>
-#pragma GCC diagnostic pop
+PRAGMA48(GCC diagnostic pop)
 
 #include "debug.h"
 
diff --git a/src/utils/sdlhelper.cpp b/src/utils/sdlhelper.cpp
index 58fa7f59b..ccffdea22 100644
--- a/src/utils/sdlhelper.cpp
+++ b/src/utils/sdlhelper.cpp
@@ -30,11 +30,11 @@
 #include "utils/glxhelper.h"
 #endif  // defined(USE_X11) && defined(USE_OPENGL)
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wshadow")
+PRAGMA48(GCC diagnostic push)
+PRAGMA48(GCC diagnostic ignored "-Wshadow")
 #include <SDL_syswm.h>
 #include <SDL_video.h>
-#pragma GCC diagnostic pop
+PRAGMA48(GCC diagnostic pop)
 
 #include "debug.h"
 
diff --git a/src/utils/sdlhelper.h b/src/utils/sdlhelper.h
index 2e9f2930d..0ba99df10 100644
--- a/src/utils/sdlhelper.h
+++ b/src/utils/sdlhelper.h
@@ -28,13 +28,13 @@ UTILS_SDL2HELPER_H
 #else
 #include "utils/stringvector.h"
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wshadow")
-#include <SDL_thread.h>
-#pragma GCC diagnostic pop
-
 #include "localconsts.h"
 
+PRAGMA48(GCC diagnostic push)
+PRAGMA48(GCC diagnostic ignored "-Wshadow")
+#include <SDL_thread.h>
+PRAGMA48(GCC diagnostic pop)
+
 struct SDL_Surface;
 struct SDL_SysWMinfo;
 
diff --git a/src/utils/sdlpixel.h b/src/utils/sdlpixel.h
index e2d3d3083..920ad4164 100644
--- a/src/utils/sdlpixel.h
+++ b/src/utils/sdlpixel.h
@@ -66,10 +66,10 @@
 
 #include "gui/color.h"
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wshadow")
+PRAGMA48(GCC diagnostic push)
+PRAGMA48(GCC diagnostic ignored "-Wshadow")
 #include <SDL.h>
-#pragma GCC diagnostic pop
+PRAGMA48(GCC diagnostic pop)
 
 #ifndef SDL_BYTEORDER
 #error missing SDL_endian.h
diff --git a/src/utils/sdlsharedhelper.cpp b/src/utils/sdlsharedhelper.cpp
index a030c7a61..1f2f04a85 100644
--- a/src/utils/sdlsharedhelper.cpp
+++ b/src/utils/sdlsharedhelper.cpp
@@ -27,10 +27,10 @@
 #include <ppapi_simple/ps.h>
 #endif  // __native_client__
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wshadow")
+PRAGMA48(GCC diagnostic push)
+PRAGMA48(GCC diagnostic ignored "-Wshadow")
 #include <SDL_events.h>
-#pragma GCC diagnostic pop
+PRAGMA48(GCC diagnostic pop)
 
 #include "debug.h"
 
diff --git a/src/utils/timer.cpp b/src/utils/timer.cpp
index 14c17adbc..cb224e8e5 100644
--- a/src/utils/timer.cpp
+++ b/src/utils/timer.cpp
@@ -22,10 +22,10 @@
 
 #include "const/utils/timer.h"
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wshadow")
+PRAGMA48(GCC diagnostic push)
+PRAGMA48(GCC diagnostic ignored "-Wshadow")
 #include <SDL_timer.h>
-#pragma GCC diagnostic pop
+PRAGMA48(GCC diagnostic pop)
 
 #include <climits>
 
-- 
cgit v1.2.3-60-g2f50