From 098d4d7979a81b55b47c17b55d9f51891dac004e Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 7 Oct 2017 21:54:28 +0300 Subject: Revert "Disable warning -Wundef in zlib.h." This reverts commit a5c11b12df43565613fe1fd6514404d2c9fef7a8. --- src/fs/virtfs/zipreader.cpp | 3 --- src/net/download.cpp | 3 --- src/resources/mapreader.cpp | 3 --- src/utils/dumplibs.cpp | 3 --- 4 files changed, 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 -PRAGMA4(GCC diagnostic pop) PRAGMA48(GCC diagnostic push) PRAGMA48(GCC diagnostic ignored "-Wshadow") #include 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 -PRAGMA4(GCC diagnostic pop) #include 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 -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 PRAGMA48(GCC diagnostic pop) -PRAGMA4(GCC diagnostic push) -PRAGMA4(GCC diagnostic ignored "-Wundef") #include -PRAGMA4(GCC diagnostic pop) #include -- cgit v1.2.3-60-g2f50