# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1456954205 -3600
# Node ID 991d8fd4d84172200b761d77e7b8e168657d92df
# Parent  f9879540d2b25ca5687304edcdeecf2093d8d981
commit https://github.com/vim/vim/commit/5fac467474376a844407cecc0ff481510ead221c
Author: Bram Moolenaar <Bram@vim.org>
Date:   Wed Mar 2 22:16:32 2016 +0100

    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
--- a/src/eval.c
+++ b/src/eval.c
@@ -3152,8 +3152,8 @@ tv_op(typval_T *tv1, typval_T *tv2, char
 		}
 		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
 		    else
 			tv1->vval.v_float -= f;
 		}
+#endif
 		return OK;
-#endif
 	}
     }
 
@@ -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
--- 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,