diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-04-11 15:28:50 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-04-11 15:28:50 +0100 |
| commit | 825b55e695b842beb6515ec5c53583aac9efe7b7 (patch) | |
| tree | baaeb35a1ee9b5be523284f7fa8185f52b95860d | |
| parent | 4a7724a4406f639edd3f93f3542626811cf56719 (diff) | |
patch 8.2.4736: build problem for Cygwin with Motifv8.2.4736
Problem: Build problem for Cygwin with Motif.
Solution: Undefine ControlMask. (Kelvin Lee, closes #10152)
| -rw-r--r-- | src/mbyte.c | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/mbyte.c b/src/mbyte.c index 78230f65e7..2b7f9991ae 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 diff --git a/src/version.c b/src/version.c index d287d8d3ba..737b54b918 100644 --- 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, |