Mercurial > vim
changeset 19515:020056c2fd39 v8.2.0315
patch 8.2.0315: build failure on HP-UX system
Commit: https://github.com/vim/vim/commit/c593bec4120f122e8a9129ec461968f1bd214435
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Feb 25 21:26:49 2020 +0100
patch 8.2.0315: build failure on HP-UX system
Problem: Build failure on HP-UX system.
Solution: Use LONG_LONG_MIN instead of LLONG_MIN. Add type casts for switch
statement. (John Marriott)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Tue, 25 Feb 2020 21:30:04 +0100 |
| parents | 25f44b7a51b1 |
| children | 209388e9e179 |
| files | src/json.c src/structs.h src/version.c |
| diffstat | 3 files changed, 13 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/json.c +++ b/src/json.c @@ -194,7 +194,7 @@ json_encode_item(garray_T *gap, typval_T 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 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)
--- a/src/structs.h +++ b/src/structs.h @@ -1279,9 +1279,15 @@ typedef long_u hash_T; // Type for hi_h #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;