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 #9709)

diff --git a/src/main.c b/src/main.c
index 5d02c95849dd61a8df2cf99bf3e161915073d5fa..80cff7cab70ddafb3116a04083d2614240f9e28d 100644 (file)
--- 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.

diff --git a/src/os_unix.c b/src/os_unix.c
index cbd8ba8bda6b3179df5ded8da2bcd571cea82c77..a6f3a6c484fdae871dd9522fa93090889292582f 100644 (file)
--- 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

diff --git a/src/pty.c b/src/pty.c
index 5f8b9e5614aab1ba2a9b73397df213b8050a8cea..4c4e9e2eada786a2eb0f0dc32d2cbb6f19bb4615 100644 (file)
--- 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

diff --git a/src/version.c b/src/version.c
index 8d0dececd1e21568fcc1be15b3e3cb9e5df9da2c..3caad5f83c37dfebf654453f6168553f86109e49 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4316,
 /**/
     4315,
 /**/

diff --git a/src/vim.h b/src/vim.h
index 86acb6dcda41a72184cc3e804c83a4db4acfd3e1..33d294c9f1ac130523070a233fa36f772453ffe3 100644 (file)
--- 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