patch 8.1.0987: unnecessary condition in #ifdef

Problem:    Unnecessary condition in #ifdef.
Solution:   Remove using CYGWIN32. (Ken Takata)

diff --git a/src/os_unix.h b/src/os_unix.h
index 8919ff0fa12c1def12d5c32663f831e73a9ffeca..5df943c70baf1e5513077c7b0f32e014fc3fab33 100644 (file)
--- a/src/os_unix.h
+++ b/src/os_unix.h
@@ -33,7 +33,7 @@
 # include <stdlib.h>
 #endif
 
-#if defined(__CYGWIN__) || defined(__CYGWIN32__)
+#ifdef __CYGWIN__
 # define WIN32UNIX     /* Compiling for Win32 using Unix files. */
 # define BINARY_FILE_IO
 

diff --git a/src/version.c b/src/version.c
index 3132a1d44809f68aeed952056ac900e63b4dd696..e7d49235da8a4735b833a252cab95726f37919cb 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -779,6 +779,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    987,
 /**/
     986,
 /**/

diff --git a/src/xxd/xxd.c b/src/xxd/xxd.c
index c24089e4ed2fa5fc1cf3c6cc67f6b2a3b5a90659..b9f6041ba0e20691e56446df2b36916b0da93bc8 100644 (file)
--- a/src/xxd/xxd.c
+++ b/src/xxd/xxd.c
@@ -71,7 +71,7 @@
 # define _CRT_SECURE_NO_DEPRECATE
 # define _CRT_NONSTDC_NO_DEPRECATE
 #endif
-#if !defined(CYGWIN) && (defined(CYGWIN32) || defined(__CYGWIN__) || defined(__CYGWIN32__))
+#if !defined(CYGWIN) && defined(__CYGWIN__)
 # define CYGWIN
 #endif