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 cf937a3205cd0f3f2590abda5a22312ed7d7cc16..793d54942c908d3023999b650b385541c2c49479 100644 (file)
--- 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 e890d110567d3ee2e2ed915e5f37c973746afc69..9a61422a1193927cbd6ee8a37b0b0716a71f31fb 100644 (file)
--- 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,
 /**/