From b247e0622ef16b7819f5dadefd3e3f0a803b4021 Mon Sep 17 00:00:00 2001
From: "K.Takata" <kentkt@csc.jp>
Date: Mon, 7 Feb 2022 10:45:23 +0000
Subject: 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)
---
 src/main.c    | 2 +-
 src/os_unix.c | 2 +-
 src/pty.c     | 4 ----
 src/version.c | 2 ++
 src/vim.h     | 4 ++--
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/main.c b/src/main.c
index 5d02c9584..80cff7cab 100644
--- 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 cbd8ba8bd..a6f3a6c48 100644
--- 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 5f8b9e561..4c4e9e2ea 100644
--- 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 8d0dececd..3caad5f83 100644
--- 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 86acb6dcd..33d294c9f 100644
--- 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
-- 
cgit v1.2.1