diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/ui/gfx/x/x11.h | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/ui/gfx/x/x11.h')
| -rw-r--r-- | chromium/ui/gfx/x/x11.h | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/chromium/ui/gfx/x/x11.h b/chromium/ui/gfx/x/x11.h index b163f788d98..2cae7c5b3ee 100644 --- a/chromium/ui/gfx/x/x11.h +++ b/chromium/ui/gfx/x/x11.h @@ -31,11 +31,8 @@ extern "C" { #include <X11/extensions/XShm.h> #include <X11/extensions/XTest.h> #include <X11/extensions/Xfixes.h> -#include <X11/extensions/Xrandr.h> #include <X11/extensions/Xrender.h> #include <X11/extensions/record.h> -#include <X11/extensions/scrnsaver.h> -#include <X11/extensions/shape.h> #include <X11/extensions/sync.h> // Define XK_xxx before the #include of <X11/keysym.h> so that <X11/keysym.h> @@ -76,6 +73,9 @@ extern "C" { #include <X11/Sunkeysym.h> #include <X11/XF86keysym.h> #include <X11/keysym.h> +} + +#include "ui/gfx/x/connection.h" // These commonly used names are undefined and if necessary recreated // in the x11 namespace below. This is the main purpose of this header @@ -97,14 +97,13 @@ extern "C" { #undef DeviceAdded // Defined by X11/extensions/XI.h to 0 #undef DeviceMode // Defined by X11/extensions/XI.h to 1 #undef DeviceRemoved // Defined by X11/extensions/XI.h to 1 -#undef FocusIn // Defined by X.h to 9 -#undef FocusOut // Defined by X.h to 10 -#undef None // Defined by X11/X.h to 0L -#undef True // Defined by X11/Xlib.h to 1 -#undef False // Defined by X11/Xlib.h to 0 -#undef CurrentTime // Defined by X11/X.h to 0L -#undef Success // Defined by X11/X.h to 0 -} +#undef FocusIn // Defined by X.h to 9 +#undef FocusOut // Defined by X.h to 10 +#undef None // Defined by X11/X.h to 0L +#undef True // Defined by X11/Xlib.h to 1 +#undef False // Defined by X11/Xlib.h to 0 +#undef CurrentTime // Defined by X11/X.h to 0L +#undef Success // Defined by X11/X.h to 0 // The x11 namespace allows to scope X11 constants and types that // would be problematic at the default preprocessor level. |