commit 77780b66f4c5573df999a7319d77a852ea4ca837
author Bram Moolenaar <Bram@vim.org> Thu Mar 01 23:10:45 2018 +0100
committer Bram Moolenaar <Bram@vim.org> Thu Mar 01 23:10:45 2018 +0100
tree fbefcbb86ab66856742558151cef411082ac91c3
parent 072687032683b1994d25a114893d9a6f8bc36612

patch 8.0.1555: build error for some combination of features

Problem:    Build error for some combination of features.
Solution:   Declare variable in more situations.

src/main.c

diff --git a/src/main.c b/src/main.c
index cf937a3..793d549 100644
--- a/src/main.c
+++ b/src/main.c
@@ -111,7 +111,7 @@
 # endif
 (int argc, char **argv)
 {
-#ifdef STARTUPTIME
+#if defined(STARTUPTIME) || defined(CLEAN_RUNTIMEPATH)
     int		i;
 #endif
 

src/version.c

diff --git a/src/version.c b/src/version.c
index e890d11..9a61422 100644
--- a/src/version.c
+++ b/src/version.c
@@ -779,6 +779,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1555,
+/**/
     1554,
 /**/
     1553,