patch 7.4.1474

Problem:    Compiler warnings without the float feature.
Solution:   Move #ifdefs. (John Marriott)

diff --git a/src/eval.c b/src/eval.c
index 76860b8b59e479462341b2799b66c34c11ccded5..794ff685bf4f5676985a1f3e07079739c33236e3 100644 (file)
--- 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 a48d5ba4034af35015cd7c9e3065f453a36cfb55..de168020ad4c03d74cf9fa2a4902296d296b9bb1 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 */
+/**/
+    1474,
 /**/
     1473,
 /**/