patch 8.0.1555: build error for some combination of features

brammool · brammool · commit 77780b66f4c5 · 2018-03-01T23:10:45.000+01:00
Problem:    Build error for some combination of features.
Solution:   Declare variable in more situations.
diff --git 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
@@ -778,6 +778,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1555,
 /**/
     1554,
 /**/

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ main`
`111`	`111`	`# endif`
`112`	`112`	`(int argc, char **argv)`
`113`	`113`	`{`
`114`		`-#ifdef STARTUPTIME`
	`114`	`+#if defined(STARTUPTIME) \|\| defined(CLEAN_RUNTIMEPATH)`
`115`	`115`	`int i;`
`116`	`116`	`#endif`
`117`	`117`