patch 8.2.4736: build problem for Cygwin with Motif

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

diff --git a/src/mbyte.c b/src/mbyte.c
index 78230f65e7ef7b9dec47e24f92262dc0b09836bd..2b7f9991ae147747023b68d3419bf86366397400 100644 (file)
--- 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

diff --git a/src/version.c b/src/version.c
index d287d8d3baae5e3c674be2906fe5eec976f9fa5d..737b54b9187e87d03ca6b7dd1b22838e2a18d689 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4736,
 /**/
     4735,
 /**/