patch 7.4.1467

Problem:    Can't build without the float feature.
Solution:   Add #ifdefs. (Nick Owens, closes #667)

diff --git a/src/eval.c b/src/eval.c
index 7d28e71372f3b5cb7dd9f1a1bb4da32a7a9e3288..76860b8b59e479462341b2799b66c34c11ccded5 100644 (file)
--- 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 cf887e5afd9394813d5ecf47ababfad607eb17f8..b41d45ee0f52d38b2e87455fda1f5f7e81191192 100644 (file)
--- 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 0a4cf2a4275101c4587cbe8686d62739af6a5063..0a56a3062b70b3ffc0e403678317daa77ae164f7 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1467,
 /**/
     1466,
 /**/