diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-02-25 21:26:49 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-02-25 21:26:49 +0100 |
| commit | c593bec4120f122e8a9129ec461968f1bd214435 (patch) | |
| tree | 22369683929b342529fb245d598e4ee9132d917b | |
| parent | e010c720b2024d8c6df45c60c6001c3b4f157de1 (diff) | |
patch 8.2.0315: build failure on HP-UX systemv8.2.0315
Problem: Build failure on HP-UX system.
Solution: Use LONG_LONG_MIN instead of LLONG_MIN. Add type casts for switch
statement. (John Marriott)
| -rw-r--r-- | src/json.c | 4 | ||||
| -rw-r--r-- | src/structs.h | 12 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 13 insertions, 5 deletions
diff --git a/src/json.c b/src/json.c index 770e144398..d5e5782c52 100644 --- a/src/json.c +++ b/src/json.c @@ -194,7 +194,7 @@ json_encode_item(garray_T *gap, typval_T *val, int copyID, int options) switch (val->v_type) { case VAR_BOOL: - switch (val->vval.v_number) + switch ((long)val->vval.v_number) { case VVAL_FALSE: ga_concat(gap, (char_u *)"false"); break; case VVAL_TRUE: ga_concat(gap, (char_u *)"true"); break; @@ -202,7 +202,7 @@ json_encode_item(garray_T *gap, typval_T *val, int copyID, int options) break; case VAR_SPECIAL: - switch (val->vval.v_number) + switch ((long)val->vval.v_number) { case VVAL_NONE: if ((options & JSON_JS) != 0 && (options & JSON_NO_NONE) == 0) diff --git a/src/structs.h b/src/structs.h index 7830e64433..e68c1f906d 100644 --- a/src/structs.h +++ b/src/structs.h @@ -1279,9 +1279,15 @@ typedef long_u hash_T; // Type for hi_hash #else typedef long long varnumber_T; typedef unsigned long long uvarnumber_T; -# define VARNUM_MIN LLONG_MIN -# define VARNUM_MAX LLONG_MAX -# define UVARNUM_MAX ULLONG_MAX +# ifdef LLONG_MIN +# define VARNUM_MIN LLONG_MIN +# define VARNUM_MAX LLONG_MAX +# define UVARNUM_MAX ULLONG_MAX +# else +# define VARNUM_MIN LONG_LONG_MIN +# define VARNUM_MAX LONG_LONG_MAX +# define UVARNUM_MAX ULONG_LONG_MAX +# endif #endif typedef double float_T; diff --git a/src/version.c b/src/version.c index 7f2a454ccf..d4fe48530f 100644 --- a/src/version.c +++ b/src/version.c @@ -739,6 +739,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 315, +/**/ 314, /**/ 313, |