From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 1 Mar 2018 22:10:45 +0000 (+0100)
Subject: patch 8.0.1555: build error for some combination of features
X-Git-Tag: v8.0.1555
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77780b66f4c5573df999a7319d77a852ea4ca837;p=thirdparty%2Fvim.git

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.
---

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
@@ -778,6 +778,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1555,
 /**/
     1554,
 /**/