]> granicus.if.org Git - vim/commitdiff
updated for version 7.4.316 v7.4.316
authorBram Moolenaar <Bram@vim.org>
Thu, 29 May 2014 12:36:29 +0000 (14:36 +0200)
committerBram Moolenaar <Bram@vim.org>
Thu, 29 May 2014 12:36:29 +0000 (14:36 +0200)
Problem:    Warning from 64-bit compiler.
Solution:   Add type cast. (Mike Williams)

src/ex_getln.c
src/version.c

index 74117324492a779aac3db4d3b29d776dbf1de31d..7659a37ff6e21703c7504a8c32258e5c2ea185e8 100644 (file)
@@ -5202,7 +5202,7 @@ globpath(path, file, ga, expand_options)
                    for (i = 0; i < num_p; ++i)
                    {
                        ((char_u **)ga->ga_data)[ga->ga_len] =
-                                           vim_strnsave(p[i], STRLEN(p[i]));
+                                       vim_strnsave(p[i], (int)STRLEN(p[i]));
                        ++ga->ga_len;
                    }
                }
index 28a4136d3021dba489fddf4d4c9087fc2b7e3408..6c113c7b0670336294c296a301ebc0ef336b7029 100644 (file)
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    316,
 /**/
     315,
 /**/