diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-10-07 21:54:28 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-10-07 21:54:28 +0300 |
| commit | 098d4d7979a81b55b47c17b55d9f51891dac004e (patch) | |
| tree | 05a39a6532ffc4c57d0cac71f36aaedab994779d /src | |
| parent | bdf9aadfe0a3b9fe0295956b28fd6d5fb7bbdcc1 (diff) | |
| download | manaplus-098d4d7979a81b55b47c17b55d9f51891dac004e.tar.gz manaplus-098d4d7979a81b55b47c17b55d9f51891dac004e.tar.bz2 manaplus-098d4d7979a81b55b47c17b55d9f51891dac004e.tar.xz manaplus-098d4d7979a81b55b47c17b55d9f51891dac004e.zip | |
Revert "Disable warning -Wundef in zlib.h."
This reverts commit a5c11b12df43565613fe1fd6514404d2c9fef7a8.
Diffstat (limited to 'src')
| -rw-r--r-- | src/fs/virtfs/zipreader.cpp | 3 | ||||
| -rw-r--r-- | src/net/download.cpp | 3 | ||||
| -rw-r--r-- | src/resources/mapreader.cpp | 3 | ||||
| -rw-r--r-- | src/utils/dumplibs.cpp | 3 |
4 files changed, 0 insertions, 12 deletions
diff --git a/src/fs/virtfs/zipreader.cpp b/src/fs/virtfs/zipreader.cpp index 45390b48d..2d473bec7 100644 --- a/src/fs/virtfs/zipreader.cpp +++ b/src/fs/virtfs/zipreader.cpp @@ -30,10 +30,7 @@ #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 4d82a2116..9068f15ca 100644 --- a/src/net/download.cpp +++ b/src/net/download.cpp @@ -30,10 +30,7 @@ #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 4eabd13ec..4d0b89b3a 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -64,10 +64,7 @@ #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 35dda6dbc..420ef62ce 100644 --- a/src/utils/dumplibs.cpp +++ b/src/utils/dumplibs.cpp @@ -36,10 +36,7 @@ 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> |