updated for version 7.4.263

Problem:    GCC 4.8 compiler warning for hiding a declaration (Francois Gannaz)
Solution:   Remove the second declaration.

diff --git a/src/eval.c b/src/eval.c
index 2d29c92c043c253f9fbeef640a9b2c05bc72f41e..c96a4e4e50d07acaed27baa5a42ce4b79bad07d5 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -18319,7 +18319,6 @@ get_cmd_output_as_rettv(argvars, rettv, retlist)
        char_u          *s = NULL;
        char_u          *start;
        char_u          *end;
-       char_u          *p;
        int             i;
 
        res = get_cmd_output(get_tv_string(&argvars[0]), infile,

diff --git a/src/version.c b/src/version.c
index 4478dd550712ed3ce4927b018929499c7d270c89..0ab6fa6088899db7b0b1199ce39d02a204a1a431 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    263,
 /**/
     262,
 /**/