summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerInterface/Xlib
diff options
context:
space:
mode:
authorGreg V <greg@unrelenting.technology>2018-02-04 23:41:02 +0300
committerGreg V <greg@unrelenting.technology>2018-02-05 14:43:07 +0300
commit9b201815f257892c0c5beb405c0ff0af7cd432dc (patch)
treea8afe7732942fba0618e9e6cca28ef8284fdbcf1 /Source/Core/InputCommon/ControllerInterface/Xlib
parent44391ad2fedc41ef5ae19cc848845d1003f9727d (diff)
Ignore -Wregister to calm down recent clang and GCC (C++17 mode)
The 'register' keyword is used by a header included from Xlib (X11/XKBlib.h).
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/Xlib')
-rw-r--r--Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp
index 29ac62f32c..74b1472536 100644
--- a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp
@@ -2,7 +2,10 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wregister"
#include <X11/XKBlib.h>
+#pragma GCC diagnostic pop
#include <cmath>
#include <cstdlib>
#include <cstring>