commit 825b55e695b842beb6515ec5c53583aac9efe7b7
author Bram Moolenaar <Bram@vim.org> Mon Apr 11 15:28:50 2022 +0100
committer Bram Moolenaar <Bram@vim.org> Mon Apr 11 15:28:50 2022 +0100
tree baaeb35a1ee9b5be523284f7fa8185f52b95860d
parent 4a7724a4406f639edd3f93f3542626811cf56719

patch 8.2.4736: build problem for Cygwin with Motif

Problem:    Build problem for Cygwin with Motif.
Solution:   Undefine ControlMask. (Kelvin Lee, closes #10152)

src/mbyte.c

diff --git a/src/mbyte.c b/src/mbyte.c
index 78230f6..2b7f999 100644
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -84,6 +84,11 @@
 #  define WIN32_LEAN_AND_MEAN
 # endif
 # if defined(FEAT_GUI) || defined(FEAT_XCLIPBOARD)
+#  ifdef __CYGWIN__
+    // ControlMask from <X11/X.h> (included in "vim.h") is conflicting with
+    // <w32api/windows.h> (included in <X11/Xwindows.h>).
+#   undef ControlMask
+#  endif
 #  include <X11/Xwindows.h>
 #  define WINBYTE wBYTE
 # else