updated for version 7.3.820

Problem:    Build errors and warnings when building with small features and
            Lua, Perl or Ruby.
Solution:   Add #ifdefs and UNUSED.

diff --git a/src/if_lua.c b/src/if_lua.c
index ce65fd2f68794bb53771400edd739fa55bf33b58..1458593b1c6a7c594160c41d9f30478ab0c2e39f 100644 (file)
--- a/src/if_lua.c
+++ b/src/if_lua.c
@@ -845,8 +845,9 @@ luaV_dict_len (lua_State *L)
 }
 
     static int
-luaV_dict_iter (lua_State *L)
+luaV_dict_iter (lua_State *L UNUSED)
 {
+#ifdef FEAT_EVAL
     hashitem_T *hi = (hashitem_T *) lua_touserdata(L, lua_upvalueindex(2));
     int n = lua_tointeger(L, lua_upvalueindex(3));
     dictitem_T *di;
@@ -860,6 +861,9 @@ luaV_dict_iter (lua_State *L)
     lua_pushinteger(L, n - 1);
     lua_replace(L, lua_upvalueindex(3));
     return 2;
+#else
+    return 0;
+#endif
 }
 
     static int

diff --git a/src/if_perl.xs b/src/if_perl.xs
index cdfac905cf25dc486e647b0bf260ed1315f5e546..67ffe18d94fab75f724632b4faec9d65d0757b5a 100644 (file)
--- a/src/if_perl.xs
+++ b/src/if_perl.xs
@@ -600,9 +600,9 @@ msg_split(s, attr)
  */
     char_u *
 eval_to_string(arg, nextcmd, dolist)
-    char_u     *arg;
-    char_u     **nextcmd;
-    int                dolist;
+    char_u     *arg UNUSED;
+    char_u     **nextcmd UNUSED;
+    int                dolist UNUSED;
 {
     return NULL;
 }

diff --git a/src/if_ruby.c b/src/if_ruby.c
index 4ae2d90d122e3da99a4ed22850dc5d3496642f65..ce40bbe8a568767cbb59c6a5468fda4845df4f03 100644 (file)
--- a/src/if_ruby.c
+++ b/src/if_ruby.c
@@ -1210,21 +1210,21 @@ static VALUE window_set_height(VALUE self, VALUE height)
     return height;
 }
 
-static VALUE window_width(VALUE self)
+static VALUE window_width(VALUE self UNUSED)
 {
-    win_T *win = get_win(self);
-
-    return INT2NUM(win->w_width);
+    return INT2NUM(W_WIDTH(get_win(self)));
 }
 
-static VALUE window_set_width(VALUE self, VALUE width)
+static VALUE window_set_width(VALUE self UNUSED, VALUE width)
 {
+#ifdef FEAT_VERTSPLIT
     win_T *win = get_win(self);
     win_T *savewin = curwin;
 
     curwin = win;
     win_setwidth(NUM2INT(width));
     curwin = savewin;
+#endif
     return width;
 }
 

diff --git a/src/version.c b/src/version.c
index 891c5c3bc66dfa8e4f6f60efcd31332d940fec16..5948b9062c319013afd70b26ed818271ce658cdd 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -725,6 +725,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    820,
 /**/
     819,
 /**/