patch 7.4.2114

Problem:    Tiny build fails.
Solution:   Always include vim_time().

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 2afa5e733a58438dfb1640f1f5456c4c1f5e60ba..860d3dc9848038c5cdeac6aaea3d412aaa536de1 100644 (file)
--- 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
index 76bca7a412f16e024ad7e3beed37215e2ea6061b..b036bfd470f1c9489b26965a938f861a2c1f8298 100644 (file)
--- 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,
 /**/