diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-03-02 22:16:32 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-03-02 22:16:32 +0100 |
| commit | 5fac467474376a844407cecc0ff481510ead221c (patch) | |
| tree | b75320953b783561440a0e410850848431b36feb | |
| parent | d1413d90983fc6c579ad66ba4d4611b057197f94 (diff) | |
| download | vim-git-5fac467474376a844407cecc0ff481510ead221c.tar.gz | |
patch 7.4.1474v7.4.1474
Problem: Compiler warnings without the float feature.
Solution: Move #ifdefs. (John Marriott)
| -rw-r--r-- | src/eval.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/eval.c b/src/eval.c index 76860b8b5..794ff685b 100644 --- a/src/eval.c +++ b/src/eval.c @@ -3152,8 +3152,8 @@ tv_op(typval_T *tv1, typval_T *tv2, char_u *op) } return OK; -#ifdef FEAT_FLOAT case VAR_FLOAT: +#ifdef FEAT_FLOAT { float_T f; @@ -3170,8 +3170,8 @@ tv_op(typval_T *tv1, typval_T *tv2, char_u *op) else tv1->vval.v_float -= f; } - return OK; #endif + return OK; } } @@ -8011,8 +8011,8 @@ tv2string( case VAR_STRING: *tofree = string_quote(tv->vval.v_string, FALSE); return *tofree; -#ifdef FEAT_FLOAT case VAR_FLOAT: +#ifdef FEAT_FLOAT *tofree = NULL; vim_snprintf((char *)numbuf, NUMBUFLEN - 1, "%g", tv->vval.v_float); return numbuf; diff --git a/src/version.c b/src/version.c index a48d5ba40..de168020a 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 */ /**/ + 1474, +/**/ 1473, /**/ 1472, |