patch 8.1.0983: checking __CYGWIN32__ unnecessarily

Problem:    Checking __CYGWIN32__ unnecessarily.
Solution:   Remove the checks. (Ken Takata)

diff --git a/src/evalfunc.c b/src/evalfunc.c
index 7f50555fc2275b2b1459fab6aaba7f897ad9d5b7..0ad8d84cf4c5ab17b19f5aa0b5388d81a6a0e1dd 100644 (file)
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -6155,7 +6155,7 @@ f_has(typval_T *argvars, typval_T *rettv)
 #ifdef MSWIN
        "win32",
 #endif
-#if defined(UNIX) && (defined(__CYGWIN32__) || defined(__CYGWIN__))
+#if defined(UNIX) && defined(__CYGWIN__)
        "win32unix",
 #endif
 #ifdef _WIN64

diff --git a/src/os_unix.c b/src/os_unix.c
index 001f0857516582e0abc078780b5ba007e3db8c99..34718101174626826c29c3e6f8d4a0440a639191 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -1605,7 +1605,7 @@ x_IOerror_check(Display *dpy UNUSED)
 {
     /* This function should not return, it causes exit().  Longjump instead. */
     LONGJMP(lc_jump_env, 1);
-#  if defined(VMS) || defined(__CYGWIN__) || defined(__CYGWIN32__)
+#  if defined(VMS) || defined(__CYGWIN__)
     return 0;  /* avoid the compiler complains about missing return value */
 #  endif
 }
@@ -1627,7 +1627,7 @@ x_IOerror_handler(Display *dpy UNUSED)
 
     /* This function should not return, it causes exit().  Longjump instead. */
     LONGJMP(x_jump_env, 1);
-# if defined(VMS) || defined(__CYGWIN__) || defined(__CYGWIN32__)
+# if defined(VMS) || defined(__CYGWIN__)
     return 0;  /* avoid the compiler complains about missing return value */
 # endif
 }
@@ -6713,7 +6713,7 @@ mch_expand_wildcards(
     }
     vim_free(tempname);
 
-# if defined(__CYGWIN__) || defined(__CYGWIN32__)
+# ifdef __CYGWIN__
     /* Translate <CR><NL> into <NL>.  Caution, buffer may contain NUL. */
     p = buffer;
     for (i = 0; i < (int)len; ++i)

diff --git a/src/os_win32.c b/src/os_win32.c
index b9233156eaaa326a86e8a7473bd50f7d35e61972..4ac5ebddb784fc4f6de6cf8c6b82af5eca22811b 100644 (file)
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -2094,8 +2094,8 @@ executable_exists(char *name, char_u **path, int use_path)
     return TRUE;
 }
 
-#if ((defined(__MINGW32__) || defined (__CYGWIN32__)) && \
-       __MSVCRT_VERSION__ >= 0x800) || (defined(_MSC_VER) && _MSC_VER >= 1400)
+#if (defined(__MINGW32__) && __MSVCRT_VERSION__ >= 0x800) || \
+       (defined(_MSC_VER) && _MSC_VER >= 1400)
 /*
  * Bad parameter handler.
  *

diff --git a/src/version.c b/src/version.c
index 8e9c87aed67b803c6eb563d8f30a7304f589630e..e2e82f5ce7df8967a27242eee8a0972fcd539315 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 */
+/**/
+    983,
 /**/
     982,
 /**/