summaryrefslogtreecommitdiff
path: root/src/dyetool
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/dyetool
parentd3c69c839b180e1d22d5a89625322dfc6ae72785 (diff)
downloadmv-5e37f24550e133d985945bb008782df543e1f428.tar.gz
mv-5e37f24550e133d985945bb008782df543e1f428.tar.bz2
mv-5e37f24550e133d985945bb008782df543e1f428.tar.xz
mv-5e37f24550e133d985945bb008782df543e1f428.zip
Fix sdl warning hiding pragmas for old compilers.
Diffstat (limited to 'src/dyetool')
-rw-r--r--src/dyetool/client.cpp18
-rw-r--r--src/dyetool/dyemain.cpp6
2 files changed, 12 insertions, 12 deletions
diff --git a/src/dyetool/client.cpp b/src/dyetool/client.cpp
index 912494b99..0a03c4c68 100644
--- a/src/dyetool/client.cpp
+++ b/src/dyetool/client.cpp
@@ -78,10 +78,10 @@
#include "net/ipc.h"
#ifdef 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)
#include <sys/time.h>
#include "fs/specialfolder.h"
#undef ERROR
@@ -89,22 +89,22 @@
#ifdef ANDROID
#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)
#include <fstream>
#endif // USE_SDL2
#endif // ANDROID
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wshadow")
+PRAGMA48(GCC diagnostic push)
+PRAGMA48(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
+PRAGMA48(GCC diagnostic pop)
#include "debug.h"
diff --git a/src/dyetool/dyemain.cpp b/src/dyetool/dyemain.cpp
index f23019bef..4caf4b94d 100644
--- a/src/dyetool/dyemain.cpp
+++ b/src/dyetool/dyemain.cpp
@@ -44,10 +44,10 @@
#include "resources/sdlimagehelper.h"
#endif // USE_SDL2
-#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)
#include "debug.h"