diff options
| author | Anthony <Helios747@users.noreply.github.com> | 2018-02-07 22:25:57 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-07 22:25:57 -0800 |
| commit | 8adce86daa1170930ed00ebba1a84e53c1617560 (patch) | |
| tree | 2bf52ee9f2431fa4a3267b4ee823e2cb62bd771d /Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp | |
| parent | bb805bdd9fc042c8aa9355ca48da679d05e45183 (diff) | |
| parent | 9b201815f257892c0c5beb405c0ff0af7cd432dc (diff) | |
Merge pull request #6355 from myfreeweb/clang6-warning
Add -Wno-register to calm down clang 6.0.0 (C++17 mode)
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp | 3 |
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> |