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

updated for version 7.4.657

Problem:    Compiler warnings for pointer mismatch.
Solution:   Add a typecast. (John Marriott)
This commit is contained in:
Bram Moolenaar
2015-03-06 22:00:11 +01:00
parent d8b77f7dc0
commit ab11a5914b
2 changed files with 4 additions and 2 deletions

View File

@@ -10175,7 +10175,7 @@ unix_expandpath(gap, path, wildoff, flags, didstar)
if (*path_end != NUL) if (*path_end != NUL)
backslash_halve(buf + len + 1); backslash_halve(buf + len + 1);
/* add existing file or symbolic link */ /* add existing file or symbolic link */
if ((flags & EW_ALLLINKS) ? mch_lstat(buf, &sb) >= 0 if ((flags & EW_ALLLINKS) ? mch_lstat((char *)buf, &sb) >= 0
: mch_getperm(buf) >= 0) : mch_getperm(buf) >= 0)
{ {
#ifdef MACOS_CONVERT #ifdef MACOS_CONVERT
@@ -10937,7 +10937,7 @@ addfile(gap, f, flags)
/* if the file/dir/link doesn't exist, may not add it */ /* if the file/dir/link doesn't exist, may not add it */
if (!(flags & EW_NOTFOUND) && ((flags & EW_ALLLINKS) if (!(flags & EW_NOTFOUND) && ((flags & EW_ALLLINKS)
? mch_lstat(f, &sb) < 0 : mch_getperm(f) < 0)) ? mch_lstat((char *)f, &sb) < 0 : mch_getperm(f) < 0))
return; return;
#ifdef FNAME_ILLEGAL #ifdef FNAME_ILLEGAL

View File

@@ -741,6 +741,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 */
/**/
657,
/**/ /**/
656, 656,
/**/ /**/