aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 8.1.0983: checking __CYGWIN32__ unnecessarily

Browse Source 
Problem:    Checking __CYGWIN32__ unnecessarily.
Solution:   Remove the checks. (Ken Takata)
This commit is contained in:
Bram Moolenaar
2019-02-26 17:03:54 +01:00
parent 32033d2397
commit 1eed532999
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/evalfunc.c
View File

@@ -6155,7 +6155,7 @@ f_has(typval_T *argvars, typval_T *rettv)
#ifdef MSWIN #ifdef MSWIN
"win32", "win32",
#endif #endif
#if defined(UNIX) && (defined(__CYGWIN32__) || defined(__CYGWIN__)) #if defined(UNIX) && defined(__CYGWIN__)
"win32unix", "win32unix",
#endif #endif
#ifdef _WIN64 #ifdef _WIN64

6
src/os_unix.c
View File

@@ -1605,7 +1605,7 @@ x_IOerror_check(Display *dpy UNUSED)
{ {
/* This function should not return, it causes exit(). Longjump instead. */ /* This function should not return, it causes exit(). Longjump instead. */
LONGJMP(lc_jump_env, 1); 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 */ return 0; /* avoid the compiler complains about missing return value */
# endif # endif
} }
@@ -1627,7 +1627,7 @@ x_IOerror_handler(Display *dpy UNUSED)
/* This function should not return, it causes exit(). Longjump instead. */ /* This function should not return, it causes exit(). Longjump instead. */
LONGJMP(x_jump_env, 1); 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 */ return 0; /* avoid the compiler complains about missing return value */
# endif # endif
} }
@@ -6713,7 +6713,7 @@ mch_expand_wildcards(
} }
vim_free(tempname); vim_free(tempname);
# if defined(__CYGWIN__) || defined(__CYGWIN32__) # ifdef __CYGWIN__
/* Translate <CR><NL> into <NL>. Caution, buffer may contain NUL. */ /* Translate <CR><NL> into <NL>. Caution, buffer may contain NUL. */
p = buffer; p = buffer;
for (i = 0; i < (int)len; ++i) for (i = 0; i < (int)len; ++i)

4
src/os_win32.c
View File

@@ -2094,8 +2094,8 @@ executable_exists(char *name, char_u **path, int use_path)
return TRUE; return TRUE;
} }
#if ((defined(__MINGW32__) || defined (__CYGWIN32__)) && \ #if (defined(__MINGW32__) && __MSVCRT_VERSION__ >= 0x800) || \
__MSVCRT_VERSION__ >= 0x800) || (defined(_MSC_VER) && _MSC_VER >= 1400) (defined(_MSC_VER) && _MSC_VER >= 1400)
/* /*
* Bad parameter handler. * Bad parameter handler.
* *

2
src/version.c
View File

@@ -779,6 +779,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
983,
/**/ /**/
982, 982,
/**/ /**/