aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 8.2.4736: build problem for Cygwin with Motif

Browse Source 
Problem:    Build problem for Cygwin with Motif.
Solution:   Undefine ControlMask. (Kelvin Lee, closes #10152)
This commit is contained in:
Bram Moolenaar
2022-04-11 15:28:50 +01:00
parent 4a7724a440
commit 825b55e695
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/mbyte.c
View File

@@ -84,6 +84,11 @@
# define WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN
# endif # endif
# if defined(FEAT_GUI) || defined(FEAT_XCLIPBOARD) # 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> # include <X11/Xwindows.h>
# define WINBYTE wBYTE # define WINBYTE wBYTE
# else # else

2
src/version.c
View File

@@ -746,6 +746,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
4736,
/**/ /**/
4735, 4735,
/**/ /**/