diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-02-26 17:03:54 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-02-26 17:03:54 +0100 |
| commit | 1eed532999adc6a2c902fa07d256be988520a995 (patch) | |
| tree | 5165869a7bfa51e23118de2e36dab5b402d64613 | |
| parent | 32033d23975dbe674f98e1ac5a9a644002faaa3e (diff) | |
| download | vim-git-1eed532999adc6a2c902fa07d256be988520a995.tar.gz | |
patch 8.1.0983: checking __CYGWIN32__ unnecessarilyv8.1.0983
Problem: Checking __CYGWIN32__ unnecessarily.
Solution: Remove the checks. (Ken Takata)
| -rw-r--r-- | src/evalfunc.c | 2 | ||||
| -rw-r--r-- | src/os_unix.c | 6 | ||||
| -rw-r--r-- | src/os_win32.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 8 insertions, 6 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c index 7f50555fc..0ad8d84cf 100644 --- 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 001f08575..347181011 100644 --- 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 b9233156e..4ac5ebddb 100644 --- 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 8e9c87aed..e2e82f5ce 100644 --- 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 */ /**/ + 983, +/**/ 982, /**/ 981, |