thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 7.4.1277

Browse Source 
Problem:    Compiler can complain about missing enum value in switch with some
            combination of features.
Solution:   Remove #ifdefs around case statements.
This commit is contained in:
Bram Moolenaar
2016-02-07 15:57:00 +01:00
parent fbc4b4db3a
commit a6f72ba7c6
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/eval.c
View File

@@ -19869,9 +19869,7 @@ f_type(typval_T *argvars, typval_T *rettv)
case VAR_FUNC: n = 2; break; case VAR_FUNC: n = 2; break;
case VAR_LIST: n = 3; break; case VAR_LIST: n = 3; break;
case VAR_DICT: n = 4; break; case VAR_DICT: n = 4; break;
#ifdef FEAT_FLOAT
case VAR_FLOAT: n = 5; break; case VAR_FLOAT: n = 5; break;
#endif
case VAR_SPECIAL: case VAR_SPECIAL:
if (argvars[0].vval.v_number == VVAL_FALSE if (argvars[0].vval.v_number == VVAL_FALSE
|| argvars[0].vval.v_number == VVAL_TRUE) || argvars[0].vval.v_number == VVAL_TRUE)
@@ -19879,9 +19877,7 @@ f_type(typval_T *argvars, typval_T *rettv)
else else
n = 7; n = 7;
break; break;
#ifdef FEAT_JOB
case VAR_JOB: n = 8; break; case VAR_JOB: n = 8; break;
#endif
case VAR_UNKNOWN: case VAR_UNKNOWN:
EMSG2(_(e_intern2), "f_type(UNKNOWN)"); EMSG2(_(e_intern2), "f_type(UNKNOWN)");
n = -1; n = -1;
@@ -24904,9 +24900,7 @@ write_viminfo_varlist(FILE *fp)
{ {
case VAR_STRING: s = "STR"; break; case VAR_STRING: s = "STR"; break;
case VAR_NUMBER: s = "NUM"; break; case VAR_NUMBER: s = "NUM"; break;
#ifdef FEAT_FLOAT
case VAR_FLOAT: s = "FLO"; break; case VAR_FLOAT: s = "FLO"; break;
#endif
case VAR_DICT: s = "DIC"; break; case VAR_DICT: s = "DIC"; break;
case VAR_LIST: s = "LIS"; break; case VAR_LIST: s = "LIS"; break;
case VAR_SPECIAL: s = "XPL"; break; case VAR_SPECIAL: s = "XPL"; break;

2
src/version.c
View File

@@ -747,6 +747,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 */
/**/
1277,
/**/ /**/
1276, 1276,
/**/ /**/