summaryrefslogtreecommitdiff
path: root/src/gui/fonts
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-06-20 01:02:22 +0300
committerAndrei Karas <akaras@inbox.ru>2017-06-20 01:02:22 +0300
commit132ee3146d10b6e6a860bfd7e03b5a8667f2a44b (patch)
tree0ef5bab643e4571ca77f4b4fa53276410edc0af2 /src/gui/fonts
parent5d8285ae8d16b40cf842f2bafd41978e316ac9b8 (diff)
downloadmv-132ee3146d10b6e6a860bfd7e03b5a8667f2a44b.tar.gz
mv-132ee3146d10b6e6a860bfd7e03b5a8667f2a44b.tar.bz2
mv-132ee3146d10b6e6a860bfd7e03b5a8667f2a44b.tar.xz
mv-132ee3146d10b6e6a860bfd7e03b5a8667f2a44b.zip
Prevent Wshadow varnings in SDL code.
Diffstat (limited to 'src/gui/fonts')
-rw-r--r--src/gui/fonts/font.h3
-rw-r--r--src/gui/fonts/textchunk.h3
2 files changed, 6 insertions, 0 deletions
diff --git a/src/gui/fonts/font.h b/src/gui/fonts/font.h
index 71661b494..053167158 100644
--- a/src/gui/fonts/font.h
+++ b/src/gui/fonts/font.h
@@ -69,7 +69,10 @@
#include "gui/fonts/textchunklist.h"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow")
#include <SDL_ttf.h>
+#pragma GCC diagnostic pop
#include "localconsts.h"
diff --git a/src/gui/fonts/textchunk.h b/src/gui/fonts/textchunk.h
index 7d0a9b2e4..2fe8c7adc 100644
--- a/src/gui/fonts/textchunk.h
+++ b/src/gui/fonts/textchunk.h
@@ -28,7 +28,10 @@
#include <string>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow")
#include <SDL_ttf.h>
+#pragma GCC diagnostic pop
#include "localconsts.h"