summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-03-01 19:33:58 +0300
committerAndrei Karas <akaras@inbox.ru>2017-03-01 19:33:58 +0300
commit4998ec60e1f065a91fd45de2aea20c4d5a002a43 (patch)
tree75f0bf68673e9c55cc79d07d1eeeca209928dd6c /src
parent73ef1fdfb80bd346431fe74c1f23dc3f2b5f5e4b (diff)
downloadmanaverse-4998ec60e1f065a91fd45de2aea20c4d5a002a43.tar.gz
manaverse-4998ec60e1f065a91fd45de2aea20c4d5a002a43.tar.bz2
manaverse-4998ec60e1f065a91fd45de2aea20c4d5a002a43.tar.xz
manaverse-4998ec60e1f065a91fd45de2aea20c4d5a002a43.zip
Fix some warnings in tests due physfs headers issues in some versions.
Diffstat (limited to 'src')
-rw-r--r--src/integrity_unittest.cc3
-rw-r--r--src/utils/dumplibs_unittest.cc3
2 files changed, 6 insertions, 0 deletions
diff --git a/src/integrity_unittest.cc b/src/integrity_unittest.cc
index 73ee5cee3..0095f22ca 100644
--- a/src/integrity_unittest.cc
+++ b/src/integrity_unittest.cc
@@ -46,7 +46,10 @@
#include "utils/delete2.h"
#ifdef USE_PHYSFS
+PRAGMA45(GCC diagnostic push)
+PRAGMA45(GCC diagnostic ignored "-Wlong-long")
#include <physfs.h>
+PRAGMA45(GCC diagnostic pop)
#endif // USE_PHYSFS
#include <SDL_image.h>
diff --git a/src/utils/dumplibs_unittest.cc b/src/utils/dumplibs_unittest.cc
index 20f89f7b7..4d0f55c7d 100644
--- a/src/utils/dumplibs_unittest.cc
+++ b/src/utils/dumplibs_unittest.cc
@@ -32,7 +32,10 @@ PRAGMACLANG6(GCC diagnostic ignored "-Wold-style-cast")
PRAGMACLANG6(GCC diagnostic pop)
#include <SDL_ttf.h>
#ifdef USE_PHYSFS
+PRAGMA45(GCC diagnostic push)
+PRAGMA45(GCC diagnostic ignored "-Wlong-long")
#include <physfs.h>
+PRAGMA45(GCC diagnostic pop)
#endif // USE_PHYSFS
#include <zlib.h>