summaryrefslogtreecommitdiff
path: root/src/net
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/net
parent5d8285ae8d16b40cf842f2bafd41978e316ac9b8 (diff)
downloadmanaverse-132ee3146d10b6e6a860bfd7e03b5a8667f2a44b.tar.gz
manaverse-132ee3146d10b6e6a860bfd7e03b5a8667f2a44b.tar.bz2
manaverse-132ee3146d10b6e6a860bfd7e03b5a8667f2a44b.tar.xz
manaverse-132ee3146d10b6e6a860bfd7e03b5a8667f2a44b.zip
Prevent Wshadow varnings in SDL code.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/eathena/messagein.cpp3
-rw-r--r--src/net/sdltcpnet.h3
-rw-r--r--src/net/tmwa/messagein.cpp3
3 files changed, 9 insertions, 0 deletions
diff --git a/src/net/eathena/messagein.cpp b/src/net/eathena/messagein.cpp
index c6512bb4c..d472f8d92 100644
--- a/src/net/eathena/messagein.cpp
+++ b/src/net/eathena/messagein.cpp
@@ -29,9 +29,12 @@
#include "utils/stringutils.h"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow")
#ifndef SDL_BIG_ENDIAN
#include <SDL_endian.h>
#endif // SDL_BYTEORDER
+#pragma GCC diagnostic pop
#include "debug.h"
diff --git a/src/net/sdltcpnet.h b/src/net/sdltcpnet.h
index 4730858e7..65433d0d4 100644
--- a/src/net/sdltcpnet.h
+++ b/src/net/sdltcpnet.h
@@ -23,7 +23,10 @@
#include "localconsts.h"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow")
#include <SDL_net.h>
+#pragma GCC diagnostic pop
namespace TcpNet
{
diff --git a/src/net/tmwa/messagein.cpp b/src/net/tmwa/messagein.cpp
index 612f943be..a689046fb 100644
--- a/src/net/tmwa/messagein.cpp
+++ b/src/net/tmwa/messagein.cpp
@@ -29,9 +29,12 @@
#include "utils/stringutils.h"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow")
#ifndef SDL_BIG_ENDIAN
#include <SDL_endian.h>
#endif // SDL_BYTEORDER
+#pragma GCC diagnostic pop
#include "debug.h"