# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1519942506 -3600
# Node ID 2103b009e32d91a52d918b2aa196976b0d3223f1
# Parent  3df741361ef83e56fe0e6182ca7ebc78106456ea
patch 8.0.1555: build error for some combination of features

commit https://github.com/vim/vim/commit/77780b66f4c5573df999a7319d77a852ea4ca837
Author: Bram Moolenaar <Bram@vim.org>
Date:   Thu Mar 1 23:10:45 2018 +0100

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