Mercurial > vim

changeset 6665:9fda0c52db0b v7.4.657

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.4.657 Problem: Compiler warnings for pointer mismatch. Solution: Add a typecast. (John Marriott)
author Bram Moolenaar <bram@vim.org>
date Fri, 06 Mar 2015 22:00:11 +0100
parents 41703afe4b59
children a82c9509dbce
files src/misc1.c src/version.c
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -10175,7 +10175,7 @@ unix_expandpath(gap, path, wildoff, flag
 		    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
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    657,
+/**/
     656,
 /**/
     655,