diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-11-06 14:17:16 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-11-06 14:17:16 +0100 |
| commit | 98500fdc6119eb5f02d7a52ab6ffcac3085181be (patch) | |
| tree | e48f9e1c38cde2e2b163f584707bdf5408b7436e | |
| parent | 4a08b0dc4dd70334056fc1bf069b5e938f2ed7d5 (diff) | |
| download | vim-git-98500fdc6119eb5f02d7a52ab6ffcac3085181be.tar.gz | |
patch 8.0.0067v8.0.0067
Problem: VMS has a problem with infinity.
Solution: Avoid an overflow. (Zoltan Arpadffy)
| -rw-r--r-- | src/json.c | 4 | ||||
| -rw-r--r-- | src/macros.h | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/json.c b/src/json.c index 7c1181ca5..36d47aa99 100644 --- a/src/json.c +++ b/src/json.c @@ -16,10 +16,6 @@ #include "vim.h" -#ifdef VAX -# undef FEAT_FLOAT // VAX does not handle well the Infinities -#endif - #if defined(FEAT_EVAL) || defined(PROTO) static int json_encode_item(garray_T *gap, typval_T *val, int copyID, int options); diff --git a/src/macros.h b/src/macros.h index 5920b5dc7..faa8ccc9c 100644 --- a/src/macros.h +++ b/src/macros.h @@ -345,7 +345,11 @@ # endif # if !defined(INFINITY) # if defined(DBL_MAX) -# define INFINITY (DBL_MAX+DBL_MAX) +# ifdef VMS +# define INFINITY DBL_MAX +# else +# define INFINITY (DBL_MAX+DBL_MAX) +# endif # else # define INFINITY (1.0 / 0.0) # endif diff --git a/src/version.c b/src/version.c index a19ef5b50..548d578ef 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 67, +/**/ 66, /**/ 65, |