From: Bram Moolenaar Date: Sun, 12 Jun 2011 19:25:00 +0000 (+0200) Subject: updated for version 7.3.211 X-Git-Tag: v7.3.211 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=03227eeb797dcc7cdd90672b67b8daff61943f21;p=vim updated for version 7.3.211 Problem: Compiler warning. Solution: Add type cast. --- diff --git a/src/if_cscope.c b/src/if_cscope.c index f9e318dde..929448bcf 100644 --- a/src/if_cscope.c +++ b/src/if_cscope.c @@ -2518,7 +2518,7 @@ cs_resolve_file(i, name) /* Check for csdir to be non empty to avoid empty path concatenated to * cscope output. TODO: avoid the unnecessary alloc/free of fullname. */ vim_free(fullname); - fullname = concat_fnames(csdir, (char_u *)name, TRUE); + fullname = (char *)concat_fnames(csdir, (char_u *)name, TRUE); } else (void)sprintf(fullname, "%s", name); diff --git a/src/version.c b/src/version.c index 1033b7481..650eafcd2 100644 --- a/src/version.c +++ b/src/version.c @@ -709,6 +709,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 211, /**/ 210, /**/