# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1551508207 -3600
# Node ID 2d8fa45b341d5cf96ecc833efe3dd07e31235a61
# Parent  e29f75e1ec72dc04c9689d3c14131e3487076bee
patch 8.1.0987: unnecessary condition in #ifdef

commit https://github.com/vim/vim/commit/6ef8f9eacdf9185d9bd03613c0a0de40ea5e3f07
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Mar 2 07:15:28 2019 +0100

    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
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -780,6 +780,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    987,
+/**/
     986,
 /**/
     985,
diff --git a/src/xxd/xxd.c b/src/xxd/xxd.c
--- 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