Merge pull request #6355 from myfreeweb/clang6-warning

Add -Wno-register to calm down clang 6.0.0 (C++17 mode)
2018-02-07 22:25:57 -08:00 · 2018-02-07 22:25:57 -08:00 · 8adce86daa
parent bb805bdd9f 9b201815f2
commit 8adce86daa
1 changed files with 3 additions and 0 deletions
--- 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>