Patch 8.2.4736

[Bram Moolenaar]

Patch 8.2.4736
Problem: Build problem for Cygwin with Motif.
Solution: Undefine ControlMask. (Kelvin Lee, closes #10152)
Files: src/mbyte.c


*** ../vim-8.2.4735/src/mbyte.c 2022-02-22 12:34:21.387356125 +0000
--- src/mbyte.c 2022-04-11 15:27:20.885018967 +0100
***************
*** 84,89 ****
--- 84,94 ----
# 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
*** ../vim-8.2.4735/src/version.c 2022-04-11 15:11:34.637531944 +0100
--- src/version.c 2022-04-11 15:28:15.372969180 +0100
***************
*** 748,749 ****
--- 748,751 ----
{ /* Add new patch number below this line */
+ /**/
+ 4736,
/**/

--
ARTHUR: What are you going to do. bleed on me?
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///