# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1649687406 -7200
# Node ID 3fe127d8ede6681d0573973afe2c4e082cd4c0c5
# Parent  f517c525b1258ba01015d3bfba9161550eeab80f
patch 8.2.4736: build problem for Cygwin with Motif

Commit: https://github.com/vim/vim/commit/825b55e695b842beb6515ec5c53583aac9efe7b7
Author: Bram Moolenaar <Bram@vim.org>
Date:   Mon Apr 11 15:28:50 2022 +0100

    patch 8.2.4736: build problem for Cygwin with Motif

    Problem:    Build problem for Cygwin with Motif.
    Solution:   Undefine ControlMask. (Kelvin Lee, closes https://github.com/vim/vim/issues/10152)

diff --git a/src/mbyte.c b/src/mbyte.c
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    4736,
+/**/
     4735,
 /**/
     4734,