summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-07-29 17:03:54 +0200
committerBram Moolenaar <Bram@vim.org>2016-07-29 17:03:54 +0200
commitd05b191b91c4e16d6887bf781832d135d2a8fae5 (patch)
tree274ce1b6fffdc22ea812def5bbcb45abfbe0fd7c
parent170b10b421f0c9fda08b7cfd3bb043c064f3659a (diff)
downloadvim-git-d05b191b91c4e16d6887bf781832d135d2a8fae5.tar.gz
patch 7.4.2114v7.4.2114
Problem: Tiny build fails. Solution: Always include vim_time().
-rw-r--r--src/ex_cmds.c2
-rw-r--r--src/version.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 2afa5e733..860d3dc98 100644
--- 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 76bca7a41..b036bfd47 100644
--- a/src/version.c
+++ b/src/version.c
@@ -759,6 +759,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2114,
+/**/
2113,
/**/
2112,