summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-11-29 21:07:58 +0100
committerBram Moolenaar <Bram@vim.org>2019-11-29 21:07:58 +0100
commit0387cae15ccdb8136381534a1f2c96b222346432 (patch)
tree85b0747a6537eb0850b56cbb916f3f8713de86c7
parent9134f1ecd41207045db3cb47f0269497980395ad (diff)
downloadvim-git-0387cae15ccdb8136381534a1f2c96b222346432.tar.gz
patch 8.1.2359: cannot build without FEAT_FLOATv8.1.2359
Problem: Cannot build without FEAT_FLOAT. (John Marriott) Solution: Fix #ifdefs around f_srand().
-rw-r--r--src/evalfunc.c6
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c
index 6b00b4e65..254b2a9ba 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -226,7 +226,9 @@ static void f_spellsuggest(typval_T *argvars, typval_T *rettv);
static void f_split(typval_T *argvars, typval_T *rettv);
#ifdef FEAT_FLOAT
static void f_sqrt(typval_T *argvars, typval_T *rettv);
+#endif
static void f_srand(typval_T *argvars, typval_T *rettv);
+#ifdef FEAT_FLOAT
static void f_str2float(typval_T *argvars, typval_T *rettv);
#endif
static void f_str2list(typval_T *argvars, typval_T *rettv);
@@ -728,8 +730,8 @@ static funcentry_T global_functions[] =
{"split", 1, 3, FEARG_1, f_split},
#ifdef FEAT_FLOAT
{"sqrt", 1, 1, FEARG_1, f_sqrt},
- {"srand", 0, 1, FEARG_1, f_srand},
#endif
+ {"srand", 0, 1, FEARG_1, f_srand},
{"state", 0, 1, FEARG_1, f_state},
#ifdef FEAT_FLOAT
{"str2float", 1, 1, FEARG_1, f_str2float},
@@ -7092,6 +7094,7 @@ f_sqrt(typval_T *argvars, typval_T *rettv)
else
rettv->vval.v_float = 0.0;
}
+#endif
/*
* "srand()" function
@@ -7160,6 +7163,7 @@ f_srand(typval_T *argvars, typval_T *rettv)
list_append_number(rettv->vval.v_list, (varnumber_T)SPLITMIX32);
}
+#ifdef FEAT_FLOAT
/*
* "str2float()" function
*/
diff --git a/src/version.c b/src/version.c
index 7318a6a6c..04808b0a2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2359,
+/**/
2358,
/**/
2357,