summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-06-20 03:06:00 +0300
committerAndrei Karas <akaras@inbox.ru>2017-06-20 04:04:40 +0300
commit5e37f24550e133d985945bb008782df543e1f428 (patch)
treed32657fab845823be6a75bc743bdf6e8a357bcaa /src/gui
parentd3c69c839b180e1d22d5a89625322dfc6ae72785 (diff)
downloadplus-5e37f24550e133d985945bb008782df543e1f428.tar.gz
plus-5e37f24550e133d985945bb008782df543e1f428.tar.bz2
plus-5e37f24550e133d985945bb008782df543e1f428.tar.xz
plus-5e37f24550e133d985945bb008782df543e1f428.zip
Fix sdl warning hiding pragmas for old compilers.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/fonts/font.h6
-rw-r--r--src/gui/fonts/textchunk.h6
-rw-r--r--src/gui/sdlinput.cpp6
-rw-r--r--src/gui/sdlinput.h6
-rw-r--r--src/gui/windowmanager.cpp6
5 files changed, 15 insertions, 15 deletions
diff --git a/src/gui/fonts/font.h b/src/gui/fonts/font.h
index 053167158..f4f30a8be 100644
--- a/src/gui/fonts/font.h
+++ b/src/gui/fonts/font.h
@@ -69,10 +69,10 @@
#include "gui/fonts/textchunklist.h"
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wshadow")
+PRAGMA48(GCC diagnostic push)
+PRAGMA48(GCC diagnostic ignored "-Wshadow")
#include <SDL_ttf.h>
-#pragma GCC diagnostic pop
+PRAGMA48(GCC diagnostic pop)
#include "localconsts.h"
diff --git a/src/gui/fonts/textchunk.h b/src/gui/fonts/textchunk.h
index 2fe8c7adc..bbd50fdff 100644
--- a/src/gui/fonts/textchunk.h
+++ b/src/gui/fonts/textchunk.h
@@ -28,10 +28,10 @@
#include <string>
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wshadow")
+PRAGMA48(GCC diagnostic push)
+PRAGMA48(GCC diagnostic ignored "-Wshadow")
#include <SDL_ttf.h>
-#pragma GCC diagnostic pop
+PRAGMA48(GCC diagnostic pop)
#include "localconsts.h"
diff --git a/src/gui/sdlinput.cpp b/src/gui/sdlinput.cpp
index e74db48ca..6fc15dcbf 100644
--- a/src/gui/sdlinput.cpp
+++ b/src/gui/sdlinput.cpp
@@ -84,10 +84,10 @@
#include "render/graphics.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 "debug.h"
diff --git a/src/gui/sdlinput.h b/src/gui/sdlinput.h
index 4ec2ee9bb..79a30758b 100644
--- a/src/gui/sdlinput.h
+++ b/src/gui/sdlinput.h
@@ -82,10 +82,10 @@
#include "input/keyinput.h"
-#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)
#ifdef USE_SDL2
#include "sdlshared.h"
diff --git a/src/gui/windowmanager.cpp b/src/gui/windowmanager.cpp
index c0336b7e3..3a95dd712 100644
--- a/src/gui/windowmanager.cpp
+++ b/src/gui/windowmanager.cpp
@@ -65,8 +65,8 @@
#include "utils/naclmessages.h"
#endif // __native_client__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wshadow")
+PRAGMA48(GCC diagnostic push)
+PRAGMA48(GCC diagnostic ignored "-Wshadow")
#ifdef ANDROID
#ifndef USE_SDL2
#include <SDL_screenkeyboard.h>
@@ -84,7 +84,7 @@
#ifdef WIN32
#include <SDL_syswm.h>
#endif // WIN32
-#pragma GCC diagnostic pop
+PRAGMA48(GCC diagnostic pop)
#include "debug.h"