diff options
| author | Bram Moolenaar <bram@vim.org> | 2015-03-06 22:00:11 +0100 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2015-03-06 22:00:11 +0100 |
| commit | 2704585132b096d8f2113881e435eb0358ec45fa (patch) | |
| tree | 5454196298addddc0b22f647b9123a9e0119816b | |
| parent | 337a88ac5b40e9353f585e7c596a1cb3c9686d56 (diff) | |
| download | vim-2704585132b096d8f2113881e435eb0358ec45fa.tar.gz | |
Problem: Compiler warnings for pointer mismatch.
Solution: Add a typecast. (John Marriott)
| -rw-r--r-- | src/misc1.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/misc1.c b/src/misc1.c index 4ff89ad0..ac87ef8f 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 7a3579a6..0e39cfbf 100644 --- 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, |