summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-03-01 23:10:45 +0100
committerBram Moolenaar <Bram@vim.org>2018-03-01 23:10:45 +0100
commit77780b66f4c5573df999a7319d77a852ea4ca837 (patch)
treefbefcbb86ab66856742558151cef411082ac91c3
parent072687032683b1994d25a114893d9a6f8bc36612 (diff)
patch 8.0.1555: build error for some combination of featuresv8.0.1555
Problem: Build error for some combination of features. Solution: Declare variable in more situations.
-rw-r--r--src/main.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/main.c b/src/main.c
index cf937a3205..793d54942c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -111,7 +111,7 @@ main
# endif
(int argc, char **argv)
{
-#ifdef STARTUPTIME
+#if defined(STARTUPTIME) || defined(CLEAN_RUNTIMEPATH)
int i;
#endif
diff --git a/src/version.c b/src/version.c
index e890d11056..9a61422a11 100644
--- a/src/version.c
+++ b/src/version.c
@@ -779,6 +779,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1555,
+/**/
1554,
/**/
1553,