From 77780b66f4c5573df999a7319d77a852ea4ca837 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 1 Mar 2018 23:10:45 +0100
Subject: [PATCH] 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    | 2 +-
 src/version.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main.c b/src/main.c
index cf937a320..793d54942 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 e890d1105..9a61422a1 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,
 /**/
-- 
2.50.1