diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-02-23 22:07:32 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-02-23 22:07:32 +0100 |
| commit | 3ea0f1ae318db6cd9413914bb2ff824d71cefc6e (patch) | |
| tree | cd03221b14cb13f92b7851a4ac9f86298bd6c931 /src/json.c | |
| parent | f1b6ac72293e658bb6e68c5cfd926c405b1b6f34 (diff) | |
patch 7.4.1408v7.4.1408
Problem: MS-Windows doesn't have isnan() and isinf().
Solution: Use _isnan() and _isinf().
Diffstat (limited to 'src/json.c')
| -rw-r--r-- | src/json.c | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/src/json.c b/src/json.c index 6eadd2e83e..1a3dea1e5b 100644 --- a/src/json.c +++ b/src/json.c @@ -17,9 +17,20 @@ #if defined(FEAT_EVAL) || defined(PROTO) -#if defined(FEAT_FLOAT) && defined(HAVE_MATH_H) - /* for isnan() and isinf() */ -# include <math.h> +#if defined(FEAT_FLOAT) +# include <float.h> +# if defined(HAVE_MATH_H) + /* for isnan() and isinf() */ +# include <math.h> +# endif +# if defined(WIN32) && !defined(isnan) +# define isnan(x) _isnan(x) +# define isinf(x) (!_finite(x) && !_isnan(x)) +# endif +# if defined(_MSC_VER) && !defined(INFINITY) +# define INFINITY (DBL_MAX+DBL_MAX) +# define NAN (INFINITY-INFINITY) +# endif #endif static int json_encode_item(garray_T *gap, typval_T *val, int copyID, int options); @@ -745,7 +756,7 @@ json_decode_item(js_read_T *reader, typval_T *res, int options) if (res != NULL) { res->v_type = VAR_FLOAT; - res->vval.v_float = 0.0 / 0.0; + res->vval.v_float = NAN; } return OK; } @@ -755,7 +766,7 @@ json_decode_item(js_read_T *reader, typval_T *res, int options) if (res != NULL) { res->v_type = VAR_FLOAT; - res->vval.v_float = 1.0 / 0.0; + res->vval.v_float = INFINITY; } return OK; } |