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 7c1181ca555266965b40d6e0e3de32adf709a368..36d47aa99d9525331abbb27eb47c20989b8c70db 100644 (file)
--- 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 5920b5dc7bc4c145a2c2609dc01a3919f59505c7..faa8ccc9c507e25152744543de18c3a4a94fd9fa 100644 (file)
--- 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 a19ef5b506ab70bb34373fff31c5f823096509b2..548d578ef3632ef81776332972daa243420a0aa9 100644 (file)
--- 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,
 /**/