From: Bram Moolenaar Date: Sun, 6 Nov 2016 13:17:16 +0000 (+0100) Subject: patch 8.0.0067 X-Git-Tag: v8.0.0067 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=98500fdc6119eb5f02d7a52ab6ffcac3085181be;p=vim patch 8.0.0067 Problem: VMS has a problem with infinity. Solution: Avoid an overflow. (Zoltan Arpadffy) --- 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 @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 67, /**/ 66, /**/