diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-01-21 10:08:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-21 10:08:27 +0100 |
| commit | 969618ebb5bf325d01346ac0ed5d4f77fe6f668b (patch) | |
| tree | fd5d38d80685f4ac5db9f48df35965767d841b38 /src/nvim/eval/encode.c | |
| parent | 53c0f0bba50f424683d281a3631aee86cce78368 (diff) | |
| parent | 226352afcbbc5af703f168c1290e07add26b44fe (diff) | |
| download | rneovim-969618ebb5bf325d01346ac0ed5d4f77fe6f668b.tar.gz rneovim-969618ebb5bf325d01346ac0ed5d4f77fe6f668b.tar.bz2 rneovim-969618ebb5bf325d01346ac0ed5d4f77fe6f668b.zip | |
Merge #9532 from justinmk/fix-fpclassify
Diffstat (limited to 'src/nvim/eval/encode.c')
| -rw-r--r-- | src/nvim/eval/encode.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/nvim/eval/encode.c b/src/nvim/eval/encode.c index 64658b52d9..6074e4ee69 100644 --- a/src/nvim/eval/encode.c +++ b/src/nvim/eval/encode.c @@ -19,6 +19,7 @@ #include "nvim/eval/typval.h" #include "nvim/garray.h" #include "nvim/mbyte.h" +#include "nvim/math.h" #include "nvim/message.h" #include "nvim/memory.h" #include "nvim/charset.h" // vim_isprintc() @@ -28,11 +29,6 @@ #include "nvim/lib/kvec.h" #include "nvim/eval/typval_encode.h" -#ifdef __MINGW32__ -# undef fpclassify -# define fpclassify __fpclassify -#endif - #define ga_concat(a, b) ga_concat(a, (char_u *)b) #define utf_ptr2char(b) utf_ptr2char((char_u *)b) #define utf_ptr2len(b) ((size_t)utf_ptr2len((char_u *)b)) @@ -327,7 +323,7 @@ int encode_read_from_list(ListReaderState *const state, char *const buf, #define TYPVAL_ENCODE_CONV_FLOAT(tv, flt) \ do { \ const float_T flt_ = (flt); \ - switch (fpclassify(flt_)) { \ + switch (xfpclassify(flt_)) { \ case FP_NAN: { \ ga_concat(gap, (char_u *) "str2float('nan')"); \ break; \ @@ -531,7 +527,7 @@ int encode_read_from_list(ListReaderState *const state, char *const buf, #define TYPVAL_ENCODE_CONV_FLOAT(tv, flt) \ do { \ const float_T flt_ = (flt); \ - switch (fpclassify(flt_)) { \ + switch (xfpclassify(flt_)) { \ case FP_NAN: { \ EMSG(_("E474: Unable to represent NaN value in JSON")); \ return FAIL; \ |