Mercurial > vim
changeset 15955:907481b9260f v8.1.0983
patch 8.1.0983: checking __CYGWIN32__ unnecessarily
commit https://github.com/vim/vim/commit/1eed532999adc6a2c902fa07d256be988520a995
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Feb 26 17:03:54 2019 +0100
patch 8.1.0983: checking __CYGWIN32__ unnecessarily
Problem: Checking __CYGWIN32__ unnecessarily.
Solution: Remove the checks. (Ken Takata)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Tue, 26 Feb 2019 17:15:13 +0100 |
parents | 4cab61f1d8d4 |
children | 1207fa46617e |
files | src/evalfunc.c src/os_unix.c src/os_win32.c src/version.c |
diffstat | 4 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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)
--- a/src/os_win32.c +++ b/src/os_win32.c @@ -2094,8 +2094,8 @@ executable_exists(char *name, char_u **p 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. *