patch 8.2.2526: build failure

Problem:    Build failure.
Solution:   Change lookup_scriptvar() arguments.

diff --git a/src/evalvars.c b/src/evalvars.c
index 57a881a289b30a81f81948a444d0cb3b5dd095b8..ce21fb255100d7e4f6e4142ebc2b3234142d1c85 100644 (file)
--- a/src/evalvars.c
+++ b/src/evalvars.c
@@ -2776,7 +2776,6 @@ get_script_local_ht(void)
 lookup_scriptvar(
        char_u  *name,
        size_t  len,
-       void    *lvar UNUSED,
        cctx_T  *dummy UNUSED)
 {
     hashtab_T  *ht = get_script_local_ht();

diff --git a/src/proto/evalvars.pro b/src/proto/evalvars.pro
index ce160d7de510bf6c2431e15fee9b23a03db23cff..144dc7cd8be52c41933e3e46bff4f3e760ddd181 100644 (file)
--- a/src/proto/evalvars.pro
+++ b/src/proto/evalvars.pro
@@ -60,7 +60,7 @@ void check_vars(char_u *name, int len);
 dictitem_T *find_var(char_u *name, hashtab_T **htp, int no_autoload);
 dictitem_T *find_var_in_ht(hashtab_T *ht, int htname, char_u *varname, int no_autoload);
 hashtab_T *get_script_local_ht(void);
-int lookup_scriptvar(char_u *name, size_t len, void *lvar, cctx_T *dummy);
+int lookup_scriptvar(char_u *name, size_t len, cctx_T *dummy);
 hashtab_T *find_var_ht(char_u *name, char_u **varname);
 char_u *get_var_value(char_u *name);
 void new_script_vars(scid_T id);

diff --git a/src/version.c b/src/version.c
index ad117896c49aa2611f4e74d6f74195d7d34d86f2..ea345104d5f36ac452d8429520280ae53ede3244 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2526,
 /**/
     2525,
 /**/