]> granicus.if.org Git - vim/commitdiff
updated for version 7.3.211 v7.3.211
authorBram Moolenaar <Bram@vim.org>
Sun, 12 Jun 2011 19:25:00 +0000 (21:25 +0200)
committerBram Moolenaar <Bram@vim.org>
Sun, 12 Jun 2011 19:25:00 +0000 (21:25 +0200)
Problem:    Compiler warning.
Solution:   Add type cast.

src/if_cscope.c
src/version.c

index f9e318dde1444fa79aa8c34b0ca5bd3ea0a5520b..929448bcf7b96b5411975b5202930bfa4863a1be 100644 (file)
@@ -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);
index 1033b74810b1ad6b72fd4c3c85d999045164c175..650eafcd23ab25c3c78fadf4c0e07e633defc917 100644 (file)
@@ -709,6 +709,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    211,
 /**/
     210,
 /**/