summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-02-17 15:05:45 +0100
committerBram Moolenaar <Bram@vim.org>2021-02-17 15:05:45 +0100
commit527ed38cfacc5abf32ef3e63f98966d011cd95de (patch)
treeea0d5e04a0b8044c79002b475abff77b380eae68
parente0890d678d4d31ca1810c90f3afe2ba89dfedcfa (diff)
patch 8.2.2526: build failurev8.2.2526
Problem: Build failure. Solution: Change lookup_scriptvar() arguments.
-rw-r--r--src/evalvars.c1
-rw-r--r--src/proto/evalvars.pro2
-rw-r--r--src/version.c2
3 files changed, 3 insertions, 2 deletions
diff --git a/src/evalvars.c b/src/evalvars.c
index 57a881a289..ce21fb2551 100644
--- 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 ce160d7de5..144dc7cd8b 100644
--- 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 ad117896c4..ea345104d5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2526,
+/**/
2525,
/**/
2524,