summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-06-24 23:02:40 +0200
committerBram Moolenaar <Bram@vim.org>2020-06-24 23:02:40 +0200
commit7acde51832f383f9a6d2e740cd0420b433ea841a (patch)
treeab5b9516866f8fb09f5ef7d2756ddc3a5493fd15
parentca275a05d8b79f6a9101604fdede2373d0dea44e (diff)
downloadvim-git-7acde51832f383f9a6d2e740cd0420b433ea841a.tar.gz
patch 8.2.1052: build failure with older compilersv8.2.1052
Problem: Build failure with older compilers. Solution: Move declaration to start of block.
-rw-r--r--src/eval.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/eval.c b/src/eval.c
index 79944c8ca..0402b3638 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1904,6 +1904,7 @@ eval1(char_u **arg, typval_T *rettv, evalarg_T *evalarg)
typval_T var2;
evalarg_T nested_evalarg;
int orig_flags;
+ int evaluate;
if (evalarg == NULL)
{
@@ -1916,8 +1917,7 @@ eval1(char_u **arg, typval_T *rettv, evalarg_T *evalarg)
orig_flags = evalarg->eval_flags;
}
- int evaluate = nested_evalarg.eval_flags & EVAL_EVALUATE;
-
+ evaluate = nested_evalarg.eval_flags & EVAL_EVALUATE;
result = FALSE;
if (evaluate)
{
diff --git a/src/version.c b/src/version.c
index 36da62001..b85dc2936 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1052,
+/**/
1051,
/**/
1050,