summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-10-07 21:03:25 +0300
committerAndrei Karas <akaras@inbox.ru>2017-10-07 21:03:25 +0300
commita5c11b12df43565613fe1fd6514404d2c9fef7a8 (patch)
treed75a3dca764f4900b397bf2bf452ad2339cffc63 /src
parent70f8e7a7cc001fb191bf17510d15c143f51e9519 (diff)
downloadplus-a5c11b12df43565613fe1fd6514404d2c9fef7a8.tar.gz
plus-a5c11b12df43565613fe1fd6514404d2c9fef7a8.tar.bz2
plus-a5c11b12df43565613fe1fd6514404d2c9fef7a8.tar.xz
plus-a5c11b12df43565613fe1fd6514404d2c9fef7a8.zip
Disable warning -Wundef in zlib.h.
Diffstat (limited to 'src')
-rw-r--r--src/fs/virtfs/zipreader.cpp3
-rw-r--r--src/net/download.cpp3
-rw-r--r--src/resources/mapreader.cpp3
-rw-r--r--src/utils/dumplibs.cpp3
4 files changed, 12 insertions, 0 deletions
diff --git a/src/fs/virtfs/zipreader.cpp b/src/fs/virtfs/zipreader.cpp
index 2d473bec7..45390b48d 100644
--- a/src/fs/virtfs/zipreader.cpp
+++ b/src/fs/virtfs/zipreader.cpp
@@ -30,7 +30,10 @@
#include "utils/delete2.h"
#include "utils/stringutils.h"
+PRAGMA4(GCC diagnostic push)
+PRAGMA4(GCC diagnostic ignored "-Wundef")
#include <zlib.h>
+PRAGMA4(GCC diagnostic pop)
PRAGMA48(GCC diagnostic push)
PRAGMA48(GCC diagnostic ignored "-Wshadow")
#include <SDL_endian.h>
diff --git a/src/net/download.cpp b/src/net/download.cpp
index 9068f15ca..4d82a2116 100644
--- a/src/net/download.cpp
+++ b/src/net/download.cpp
@@ -30,7 +30,10 @@
#include "utils/cast.h"
#include "utils/sdlhelper.h"
+PRAGMA4(GCC diagnostic push)
+PRAGMA4(GCC diagnostic ignored "-Wundef")
#include <zlib.h>
+PRAGMA4(GCC diagnostic pop)
#include <sstream>
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index 4d0b89b3a..4eabd13ec 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -64,7 +64,10 @@
#include "utils/translation/podict.h"
+PRAGMA4(GCC diagnostic push)
+PRAGMA4(GCC diagnostic ignored "-Wundef")
#include <zlib.h>
+PRAGMA4(GCC diagnostic pop)
#include "debug.h"
diff --git a/src/utils/dumplibs.cpp b/src/utils/dumplibs.cpp
index 420ef62ce..35dda6dbc 100644
--- a/src/utils/dumplibs.cpp
+++ b/src/utils/dumplibs.cpp
@@ -36,7 +36,10 @@ PRAGMACLANG6GCC(GCC diagnostic pop)
#include <SDL_ttf.h>
PRAGMA48(GCC diagnostic pop)
+PRAGMA4(GCC diagnostic push)
+PRAGMA4(GCC diagnostic ignored "-Wundef")
#include <zlib.h>
+PRAGMA4(GCC diagnostic pop)
#include <curl/curl.h>