summaryrefslogtreecommitdiff
path: root/src/enums/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-03-10 02:29:25 +0300
committerAndrei Karas <akaras@inbox.ru>2017-03-10 02:29:25 +0300
commit0eaeb9e50cb6114b0808ee140326ab015c533cee (patch)
treea8a448b59460fccec64b3ef17ed0182f1b337d64 /src/enums/gui
parent50c489bc7a36972186cdb843c0582195f37e4549 (diff)
downloadplus-0eaeb9e50cb6114b0808ee140326ab015c533cee.tar.gz
plus-0eaeb9e50cb6114b0808ee140326ab015c533cee.tar.bz2
plus-0eaeb9e50cb6114b0808ee140326ab015c533cee.tar.xz
plus-0eaeb9e50cb6114b0808ee140326ab015c533cee.zip
Fix compilation warnings with mingw.
Diffstat (limited to 'src/enums/gui')
-rw-r--r--src/enums/gui/chattabtype.h9
-rw-r--r--src/enums/gui/npcactionstate.h7
2 files changed, 15 insertions, 1 deletions
diff --git a/src/enums/gui/chattabtype.h b/src/enums/gui/chattabtype.h
index 8b032a1f4..f37a98db6 100644
--- a/src/enums/gui/chattabtype.h
+++ b/src/enums/gui/chattabtype.h
@@ -23,6 +23,13 @@
#include "enums/simpletypes/enumdefines.h"
+#ifdef INPUT
+#undef INPUT
+#endif // INPUT
+
+PRAGMAMINGW(GCC diagnostic push)
+PRAGMAMINGW(GCC diagnostic ignored "-Wshadow")
+
enumStart(ChatTabType)
{
UNKNOWN = 0,
@@ -39,4 +46,6 @@ enumStart(ChatTabType)
}
enumEnd(ChatTabType);
+PRAGMAMINGW(GCC diagnostic pop)
+
#endif // ENUMS_GUI_CHATTABTYPE_H
diff --git a/src/enums/gui/npcactionstate.h b/src/enums/gui/npcactionstate.h
index c044d74aa..d541b3013 100644
--- a/src/enums/gui/npcactionstate.h
+++ b/src/enums/gui/npcactionstate.h
@@ -26,9 +26,12 @@
#include "enums/simpletypes/enumdefines.h"
#ifdef INPUT
-#undef
+#undef INPUT
#endif // INPUT
+PRAGMAMINGW(GCC diagnostic push)
+PRAGMAMINGW(GCC diagnostic ignored "-Wshadow")
+
enumStart(NpcActionState)
{
WAIT = 0,
@@ -38,4 +41,6 @@ enumStart(NpcActionState)
}
enumEnd(NpcActionState);
+PRAGMAMINGW(GCC diagnostic pop)
+
#endif // ENUMS_GUI_NPCACTIONSTATE_H