diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2018-07-04 23:17:16 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2018-07-11 19:18:38 +0000 |
| commit | 89f7e090efe1c5f0df627f83492174a0f4e47e32 (patch) | |
| tree | c0d370e81c8b11c8414bedd82bd0e7e4632c9a25 /src/plugins/platforms/xcb/qxcbconnection.cpp | |
| parent | abbd28f551a128cc0959b8c6ba25ac6a2f821217 (diff) | |
XCB/Xlib: make sure we don't get problems for sys headers using register
Found while compiling on FreeBSD 11.2 (clang 6 update has the warning):
/usr/local/include/X11/Xlibint.h:675:7: error: ISO C++17 does not allow 'register' storage class specifier [-Wregister]
Change-Id: I117816bf0f5e469b8d34fffd153e6482ccaed69f
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbconnection.cpp')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbconnection.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp index f7b8fa1a78..20414d0525 100644 --- a/src/plugins/platforms/xcb/qxcbconnection.cpp +++ b/src/plugins/platforms/xcb/qxcbconnection.cpp @@ -73,10 +73,12 @@ #include <xcb/xinerama.h> #if QT_CONFIG(xcb_xlib) +#define register /* C++17 deprecated register */ #include <X11/Xlib.h> #include <X11/Xlib-xcb.h> #include <X11/Xlibint.h> #include <X11/Xutil.h> +#undef register #endif #if QT_CONFIG(xinput2) |