Mercurial > vim
changeset 27579:41a61dbb46d2 v8.2.4316
patch 8.2.4316: __CYGWIN32__ is not defined on 64 bit systems
Commit: https://github.com/vim/vim/commit/b247e0622ef16b7819f5dadefd3e3f0a803b4021
Author: K.Takata <kentkt@csc.jp>
Date: Mon Feb 7 10:45:23 2022 +0000
patch 8.2.4316: __CYGWIN32__ is not defined on 64 bit systems
Problem: __CYGWIN32__ is not defined on 64 bit systems.
Solution: Update #ifdefs. (Ken Takata, closes https://github.com/vim/vim/issues/9709)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Mon, 07 Feb 2022 12:00:04 +0100 |
| parents | d7cf6f67163d |
| children | bd5169e86dc5 |
| files | src/main.c src/os_unix.c src/pty.c src/version.c src/vim.h |
| diffstat | 5 files changed, 6 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/main.c +++ b/src/main.c @@ -2571,7 +2571,7 @@ scripterror: } } #endif -#ifdef __CYGWIN32__ +#ifdef __CYGWIN__ /* * If vim is invoked by non-Cygwin tools, convert away any * DOS paths, so things like .swp files are created correctly.
--- a/src/os_unix.c +++ b/src/os_unix.c @@ -6341,7 +6341,7 @@ select_eintr: FD_ZERO(&wfds); FD_ZERO(&efds); FD_SET(fd, &rfds); -# if !defined(__QNX__) && !defined(__CYGWIN32__) +# ifndef __QNX__ // For QNX select() always returns 1 if this is set. Why? FD_SET(fd, &efds); # endif
--- a/src/pty.c +++ b/src/pty.c @@ -46,10 +46,6 @@ #include <signal.h> -#ifdef __CYGWIN32__ -# include <sys/termios.h> -#endif - #ifdef HAVE_SYS_IOCTL_H # include <sys/ioctl.h> #endif
--- 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 */ /**/ + 4316, +/**/ 4315, /**/ 4314,
--- a/src/vim.h +++ b/src/vim.h @@ -1576,10 +1576,10 @@ typedef UINT32_TYPEDEF UINT32_T; #endif /* - * EMX doesn't have a global way of making open() use binary I/O. + * Cygwin doesn't have a global way of making open() use binary I/O. * Use O_BINARY for all open() calls. */ -#if defined(__CYGWIN32__) +#ifdef __CYGWIN__ # define O_EXTRA O_BINARY #else # define O_EXTRA 0