summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-02-29 23:12:49 +0100
committerBram Moolenaar <Bram@vim.org>2016-02-29 23:12:49 +0100
commit10b369f67064cee91a5eb41383a694162c5c5e73 (patch)
tree10b15eff2f8441cc1358a61e301c27de05c55693
parent6b584af3d7337639da27fd847c7c69a406af397e (diff)
downloadvim-git-10b369f67064cee91a5eb41383a694162c5c5e73.tar.gz
patch 7.4.1467v7.4.1467
Problem: Can't build without the float feature. Solution: Add #ifdefs. (Nick Owens, closes #667)
-rw-r--r--src/eval.c2
-rw-r--r--src/json.c2
-rw-r--r--src/version.c2
3 files changed, 5 insertions, 1 deletions
diff --git a/src/eval.c b/src/eval.c
index 7d28e7137..76860b8b5 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -8415,7 +8415,9 @@ static struct fst
{"range", 1, 3, f_range},
{"readfile", 1, 3, f_readfile},
{"reltime", 0, 2, f_reltime},
+#ifdef FEAT_FLOAT
{"reltimefloat", 1, 1, f_reltimefloat},
+#endif
{"reltimestr", 1, 1, f_reltimestr},
{"remote_expr", 2, 3, f_remote_expr},
{"remote_foreground", 1, 1, f_remote_foreground},
diff --git a/src/json.c b/src/json.c
index cf887e5af..b41d45ee0 100644
--- a/src/json.c
+++ b/src/json.c
@@ -733,9 +733,9 @@ json_decode_item(js_read_T *reader, typval_T *res, int options)
default:
if (VIM_ISDIGIT(*p) || *p == '-')
{
+#ifdef FEAT_FLOAT
char_u *sp = p;
-#ifdef FEAT_FLOAT
if (*sp == '-')
{
++sp;
diff --git a/src/version.c b/src/version.c
index 0a4cf2a42..0a56a3062 100644
--- a/src/version.c
+++ b/src/version.c
@@ -744,6 +744,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1467,
+/**/
1466,
/**/
1465,