[PATCH 1/3] winex11.drv: Define ControlMask when not available
Alistair Leslie-Hughes
wine at gitlab.winehq.org
Mon May 23 05:44:23 CDT 2022
From: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
---
dlls/winex11.drv/keyboard.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c
index 6157548474b..5bd8fb5ca43 100644
--- a/dlls/winex11.drv/keyboard.c
+++ b/dlls/winex11.drv/keyboard.c
@@ -64,6 +64,11 @@
WINE_DEFAULT_DEBUG_CHANNEL(keyboard);
WINE_DECLARE_DEBUG_CHANNEL(key);
+/* X.h defines ControlMask but conflicts with struct variable name */
+#ifndef ControlMask
+#define ControlMask (1<<2)
+#endif
+
static int min_keycode, max_keycode, keysyms_per_keycode;
static KeySym *key_mapping;
static WORD keyc2vkey[256], keyc2scan[256];
--
GitLab
https://gitlab.winehq.org/wine/wine/-/merge_requests/115
More information about the wine-devel
mailing list