diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-02-07 15:57:00 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-02-07 15:57:00 +0100 |
| commit | a6f72ba7c6cadd37be38d92008d10a3025fdc5ec (patch) | |
| tree | e6d4190494150f99a8211ff29c3f546963e3f961 | |
| parent | fbc4b4db3a9690906a96e16724350a6241cf32a5 (diff) | |
patch 7.4.1277v7.4.1277
Problem: Compiler can complain about missing enum value in switch with some
combination of features.
Solution: Remove #ifdefs around case statements.
| -rw-r--r-- | src/eval.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/eval.c b/src/eval.c index f295d3634c..bd0040e66a 100644 --- a/src/eval.c +++ b/src/eval.c @@ -19869,9 +19869,7 @@ f_type(typval_T *argvars, typval_T *rettv) case VAR_FUNC: n = 2; break; case VAR_LIST: n = 3; break; case VAR_DICT: n = 4; break; -#ifdef FEAT_FLOAT case VAR_FLOAT: n = 5; break; -#endif case VAR_SPECIAL: if (argvars[0].vval.v_number == VVAL_FALSE || argvars[0].vval.v_number == VVAL_TRUE) @@ -19879,9 +19877,7 @@ f_type(typval_T *argvars, typval_T *rettv) else n = 7; break; -#ifdef FEAT_JOB case VAR_JOB: n = 8; break; -#endif case VAR_UNKNOWN: EMSG2(_(e_intern2), "f_type(UNKNOWN)"); n = -1; @@ -24904,9 +24900,7 @@ write_viminfo_varlist(FILE *fp) { case VAR_STRING: s = "STR"; break; case VAR_NUMBER: s = "NUM"; break; -#ifdef FEAT_FLOAT case VAR_FLOAT: s = "FLO"; break; -#endif case VAR_DICT: s = "DIC"; break; case VAR_LIST: s = "LIS"; break; case VAR_SPECIAL: s = "XPL"; break; diff --git a/src/version.c b/src/version.c index 6e553886d6..f979949b5a 100644 --- a/src/version.c +++ b/src/version.c @@ -748,6 +748,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1277, +/**/ 1276, /**/ 1275, |