From ab11a5914b04228249d429cbc2dd6c56ae6c8232 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 6 Mar 2015 22:00:11 +0100 Subject: updated for version 7.4.657 Problem: Compiler warnings for pointer mismatch. Solution: Add a typecast. (John Marriott) --- src/misc1.c | 4 ++-- src/version.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/misc1.c b/src/misc1.c index 4ff89ad0c..ac87ef8fc 100644 --- a/src/misc1.c +++ b/src/misc1.c @@ -10175,7 +10175,7 @@ unix_expandpath(gap, path, wildoff, flags, didstar) if (*path_end != NUL) backslash_halve(buf + len + 1); /* 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) { #ifdef MACOS_CONVERT @@ -10937,7 +10937,7 @@ addfile(gap, f, flags) /* if the file/dir/link doesn't exist, may not add it */ 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; #ifdef FNAME_ILLEGAL diff --git a/src/version.c b/src/version.c index 7a3579a6e..0e39cfbf1 100644 --- a/src/version.c +++ b/src/version.c @@ -741,6 +741,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 657, /**/ 656, /**/ -- cgit v1.2.1