Mercurial > vim
changeset 28423:3fe127d8ede6 v8.2.4736
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)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Mon, 11 Apr 2022 16:30:06 +0200 |
parents | f517c525b125 |
children | 6c275c41f7e5 |
files | src/mbyte.c src/version.c |
diffstat | 2 files changed, 7 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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