Merge pull request #6355 from myfreeweb/clang6-warning

Add -Wno-register to calm down clang 6.0.0 (C++17 mode)
dolphin-emu · Feb 8, 2018 · 8adce86 · 8adce86
2 parents bb805bd + 9b20181
commit 8adce86
Showing 1 changed file with 3 additions and 0 deletions.
diff --git 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>