updated for version 7.4.373

Problem:    Compiler warning for unused argument and unused variable.
Solution:   Add UNUSED.  Move variable inside #ifdef.

diff --git a/src/charset.c b/src/charset.c
index 83a6850df2914e5fb18981badc89140d0815ba2b..e7aabe7ed5a8fa8e61aad2469d3eef6acc510802 100644 (file)
--- a/src/charset.c
+++ b/src/charset.c
@@ -1024,7 +1024,7 @@ vim_isprintc_strict(c)
  */
     int
 lbr_chartabsize(line, s, col)
-    char_u             *line; /* start of the line */
+    char_u             *line UNUSED; /* start of the line */
     unsigned char      *s;
     colnr_T            col;
 {
@@ -1069,7 +1069,7 @@ lbr_chartabsize_adv(line, s, col)
     int
 win_lbr_chartabsize(wp, line, s, col, headp)
     win_T      *wp;
-    char_u     *line; /* start of the line */
+    char_u     *line UNUSED; /* start of the line */
     char_u     *s;
     colnr_T    col;
     int                *headp UNUSED;

diff --git a/src/version.c b/src/version.c
index 0a8607de8f3be5a750af9a9b48e6521492b66b7e..47d5adb5f4e7ed9cfb8fceb87bec9d3af2dd1ef2 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 */
+/**/
+    373,
 /**/
     372,
 /**/

diff --git a/src/window.c b/src/window.c
index 9fe56b1f88d5148c06a221293eb0d78afda7d974..f81f5527b52a4d145ee8586e26fec571d59a52af 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -686,9 +686,7 @@ win_split_ins(size, flags, new_wp, dir)
     int                layout;
     frame_T    *frp, *curfrp;
     int                before;
-    int                minwidth;
     int                minheight;
-    int                wmw1;
     int                wmh1;
 
     if (flags & WSP_TOP)
@@ -718,6 +716,9 @@ win_split_ins(size, flags, new_wp, dir)
 #ifdef FEAT_VERTSPLIT
     if (flags & WSP_VERT)
     {
+       int     wmw1;
+       int     minwidth;
+
        layout = FR_ROW;
 
        /*