Mercurial > vim

changeset 6068:353330c512a9 v7.4.373

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.4.373 Problem: Compiler warning for unused argument and unused variable. Solution: Add UNUSED. Move variable inside #ifdef.
author Bram Moolenaar <bram@vim.org>
date Wed, 16 Jul 2014 23:39:54 +0200
parents 48077e3b83f6
children febc041c984b
files src/charset.c src/version.c src/window.c
diffstat 3 files changed, 7 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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;
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    373,
+/**/
     372,
 /**/
     371,
--- 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;
 
 	/*