summaryrefslogtreecommitdiff
path: root/src/utils
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-02-07 17:21:59 +0300
committerAndrei Karas <akaras@inbox.ru>2017-02-07 17:21:59 +0300
commitf29d4876505fd3fd8c5d2c115e2a790409b02289 (patch)
treef25c9d77139e8ae0e02ab6631e99c80566d7e588 /src/utils
parente9492b0913465c274ff9bf28934967febb553db3 (diff)
downloadmv-f29d4876505fd3fd8c5d2c115e2a790409b02289.tar.gz
mv-f29d4876505fd3fd8c5d2c115e2a790409b02289.tar.bz2
mv-f29d4876505fd3fd8c5d2c115e2a790409b02289.tar.xz
mv-f29d4876505fd3fd8c5d2c115e2a790409b02289.zip
Fix compilation with gcc version below 4.6.
Diffstat (limited to 'src/utils')
-rw-r--r--src/utils/buildhex.h6
-rw-r--r--src/utils/dumplibs.cpp6
-rw-r--r--src/utils/physfsrwops.h6
-rw-r--r--src/utils/physfstools.h8
-rw-r--r--src/utils/sdl2helper.h7
5 files changed, 18 insertions, 15 deletions
diff --git a/src/utils/buildhex.h b/src/utils/buildhex.h
index 0e728fed0..3ee72d28c 100644
--- a/src/utils/buildhex.h
+++ b/src/utils/buildhex.h
@@ -22,15 +22,15 @@
#define UTILS_BUILDHEX_H
#ifdef USE_SDL2
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wswitch-default"
+PRAGMA45(GCC diagnostic push)
+PRAGMA45(GCC diagnostic ignored "-Wswitch-default")
#endif // USE_SDL2
#include <SDL_stdinc.h>
#if !defined(_SDL_stdinc_h) && !defined(SDL_stdinc_h_) && !defined(SDL_stdinc_h)
#error need include SDL_stdinc.h
#endif // !defined(_SDL_stdinc_h) && !defined(SDL_stdinc_h_)
#ifdef USE_SDL2
-#pragma GCC diagnostic pop
+PRAGMA45(GCC diagnostic pop)
#endif // USE_SDL2
#ifndef SDL_BIG_ENDIAN
diff --git a/src/utils/dumplibs.cpp b/src/utils/dumplibs.cpp
index 6b99cd088..4efd647d8 100644
--- a/src/utils/dumplibs.cpp
+++ b/src/utils/dumplibs.cpp
@@ -31,10 +31,10 @@ PRAGMACLANG6(GCC diagnostic ignored "-Wold-style-cast")
#include <SDL_net.h>
PRAGMACLANG6(GCC diagnostic pop)
#include <SDL_ttf.h>
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wlong-long"
+PRAGMA45(GCC diagnostic push)
+PRAGMA45(GCC diagnostic ignored "-Wlong-long")
#include <physfs.h>
-#pragma GCC diagnostic pop
+PRAGMA45(GCC diagnostic pop)
#include <zlib.h>
#include <curl/curl.h>
diff --git a/src/utils/physfsrwops.h b/src/utils/physfsrwops.h
index 44e174814..f3eefe0a5 100644
--- a/src/utils/physfsrwops.h
+++ b/src/utils/physfsrwops.h
@@ -26,15 +26,15 @@
#define UTILS_PHYSFSRWOPS_H
#ifdef USE_SDL2
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wswitch-default"
+PRAGMA45(GCC diagnostic push)
+PRAGMA45(GCC diagnostic ignored "-Wswitch-default")
#endif // USE_SDL2
#include <SDL_stdinc.h>
#if !defined(_SDL_stdinc_h) && !defined(SDL_stdinc_h_) && !defined(SDL_stdinc_h)
#error need include SDL_stdinc.h
#endif // !defined(_SDL_stdinc_h) && !defined(SDL_stdinc_h_)
#ifdef USE_SDL2
-#pragma GCC diagnostic pop
+PRAGMA45(GCC diagnostic pop)
#endif // USE_SDL2
#include <SDL_rwops.h>
diff --git a/src/utils/physfstools.h b/src/utils/physfstools.h
index f65b9c344..3db197927 100644
--- a/src/utils/physfstools.h
+++ b/src/utils/physfstools.h
@@ -21,10 +21,12 @@
#ifndef UTILS_PHYSFSTOOLS_H
#define UTILS_PHYSFSTOOLS_H
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wlong-long"
+#include "localconsts.h"
+
+PRAGMA45(GCC diagnostic push)
+PRAGMA45(GCC diagnostic ignored "-Wlong-long")
#include <physfs.h>
-#pragma GCC diagnostic pop
+PRAGMA45(GCC diagnostic pop)
#include <string>
diff --git a/src/utils/sdl2helper.h b/src/utils/sdl2helper.h
index 8e1333e16..412701a02 100644
--- a/src/utils/sdl2helper.h
+++ b/src/utils/sdl2helper.h
@@ -24,13 +24,14 @@
#ifdef USE_SDL2
#include "utils/stringvector.h"
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wswitch-default"
+PRAGMA45(GCC diagnostic push)
+PRAGMA45(GCC diagnostic ignored "-Wswitch-default")
#include <SDL_stdinc.h>
#if !defined(_SDL_stdinc_h) && !defined(SDL_stdinc_h_) && !defined(SDL_stdinc_h)
#error need include SDL_stdinc.h
#endif // !defined(_SDL_stdinc_h) && !defined(SDL_stdinc_h_)
-#pragma GCC diagnostic pop
+
+PRAGMA45(GCC diagnostic pop)
#include <SDL_thread.h>
#include "localconsts.h"