0
0
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00

patch 7.4.1474

Problem:    Compiler warnings without the float feature.
Solution:   Move #ifdefs. (John Marriott)
This commit is contained in:
Bram Moolenaar
2016-03-02 22:16:32 +01:00
parent d1413d9098
commit 5fac467474
2 changed files with 5 additions and 3 deletions

View File

@@ -3152,8 +3152,8 @@ tv_op(typval_T *tv1, typval_T *tv2, char_u *op)
} }
return OK; return OK;
#ifdef FEAT_FLOAT
case VAR_FLOAT: case VAR_FLOAT:
#ifdef FEAT_FLOAT
{ {
float_T f; float_T f;
@@ -3170,8 +3170,8 @@ tv_op(typval_T *tv1, typval_T *tv2, char_u *op)
else else
tv1->vval.v_float -= f; tv1->vval.v_float -= f;
} }
return OK;
#endif #endif
return OK;
} }
} }
@@ -8011,8 +8011,8 @@ tv2string(
case VAR_STRING: case VAR_STRING:
*tofree = string_quote(tv->vval.v_string, FALSE); *tofree = string_quote(tv->vval.v_string, FALSE);
return *tofree; return *tofree;
#ifdef FEAT_FLOAT
case VAR_FLOAT: case VAR_FLOAT:
#ifdef FEAT_FLOAT
*tofree = NULL; *tofree = NULL;
vim_snprintf((char *)numbuf, NUMBUFLEN - 1, "%g", tv->vval.v_float); vim_snprintf((char *)numbuf, NUMBUFLEN - 1, "%g", tv->vval.v_float);
return numbuf; return numbuf;

View File

@@ -743,6 +743,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1474,
/**/ /**/
1473, 1473,
/**/ /**/