Skip to content

Commit a6f72ba

Browse files
committed
patch 7.4.1277
Problem: Compiler can complain about missing enum value in switch with some combination of features. Solution: Remove #ifdefs around case statements.
1 parent fbc4b4d commit a6f72ba

2 files changed

Lines changed: 2 additions & 6 deletions

File tree

src/eval.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19869,19 +19869,15 @@ f_type(typval_T *argvars, typval_T *rettv)
1986919869
case VAR_FUNC: n = 2; break;
1987019870
case VAR_LIST: n = 3; break;
1987119871
case VAR_DICT: n = 4; break;
19872-
#ifdef FEAT_FLOAT
1987319872
case VAR_FLOAT: n = 5; break;
19874-
#endif
1987519873
case VAR_SPECIAL:
1987619874
if (argvars[0].vval.v_number == VVAL_FALSE
1987719875
|| argvars[0].vval.v_number == VVAL_TRUE)
1987819876
n = 6;
1987919877
else
1988019878
n = 7;
1988119879
break;
19882-
#ifdef FEAT_JOB
1988319880
case VAR_JOB: n = 8; break;
19884-
#endif
1988519881
case VAR_UNKNOWN:
1988619882
EMSG2(_(e_intern2), "f_type(UNKNOWN)");
1988719883
n = -1;
@@ -24904,9 +24900,7 @@ write_viminfo_varlist(FILE *fp)
2490424900
{
2490524901
case VAR_STRING: s = "STR"; break;
2490624902
case VAR_NUMBER: s = "NUM"; break;
24907-
#ifdef FEAT_FLOAT
2490824903
case VAR_FLOAT: s = "FLO"; break;
24909-
#endif
2491024904
case VAR_DICT: s = "DIC"; break;
2491124905
case VAR_LIST: s = "LIS"; break;
2491224906
case VAR_SPECIAL: s = "XPL"; break;

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -747,6 +747,8 @@ static char *(features[]) =
747747

748748
static int included_patches[] =
749749
{ /* Add new patch number below this line */
750+
/**/
751+
1277,
750752
/**/
751753
1276,
752754
/**/

0 commit comments

Comments
 (0)