patch 7.4.2114

brammool · brammool · commit d05b191b91c4 · 2016-07-29T17:03:54.000+02:00
Problem:    Tiny build fails.
Solution:   Always include vim_time().
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
@@ -2867,7 +2867,6 @@ write_viminfo_barlines(vir_T *virp, FILE *fp_out)
 }
 #endif /* FEAT_VIMINFO */
 
-#if defined(FEAT_CMDHIST) || defined(FEAT_VIMINFO) || defined(PROTO)
 /*
  * Return the current time in seconds.  Calls time(), unless test_settime()
  * was used.
@@ -2881,7 +2880,6 @@ vim_time(void)
     return time(NULL);
 # endif
 }
-#endif
 
 /*
  * Implementation of ":fixdel", also used by get_stty().
diff --git a/src/version.c b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2114,
 /**/
     2113,
 /**/

Original file line number	Diff line number	Diff line change
`@@ -2867,7 +2867,6 @@ write_viminfo_barlines(vir_T virp, FILE fp_out)`
`2867`	`2867`	`}`
`2868`	`2868`	`#endif /* FEAT_VIMINFO */`
`2869`	`2869`
`2870`		`-#if defined(FEAT_CMDHIST) \|\| defined(FEAT_VIMINFO) \|\| defined(PROTO)`
`2871`	`2870`	`/*`
`2872`	`2871`	`* Return the current time in seconds. Calls time(), unless test_settime()`
`2873`	`2872`	`* was used.`
`@@ -2881,7 +2880,6 @@ vim_time(void)`
`2881`	`2880`	`return time(NULL);`
`2882`	`2881`	`# endif`
`2883`	`2882`	`}`
`2884`		`-#endif`
`2885`	`2883`
`2886`	`2884`	`/*`
`2887`	`2885`	`* Implementation of ":fixdel", also used by get_stty().`