mirror/json-c
1
0
Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-04-04 04:49:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert part of PR#606 and use isnan/isinf again, but provide macro implementations of those in math_compat.h is needed, as it seems to be on AIX and IBM i systems.

Browse Source
This commit is contained in:
Eric Haszlakiewicz
2020-05-16 01:29:18 +00:00
parent 1526c84a13
commit 0a3d22b9bb
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
json_object.c
View File

@@ -903,15 +903,11 @@ static int json_object_double_to_json_string_format(struct json_object *jso, str
* ECMA 262 section 9.8.1 defines * ECMA 262 section 9.8.1 defines
* how to handle these cases as strings * how to handle these cases as strings
*/ */
#ifdef HAVE_DECL_ISNAN
if (isnan(jso->o.c_double)) if (isnan(jso->o.c_double))
{ {
size = snprintf(buf, sizeof(buf), "NaN"); size = snprintf(buf, sizeof(buf), "NaN");
} }
else else if (isinf(jso->o.c_double))
#endif
#ifdef HAVE_DECL_ISINF
if (isinf(jso->o.c_double))
{ {
if (jso->o.c_double > 0) if (jso->o.c_double > 0)
size = snprintf(buf, sizeof(buf), "Infinity"); size = snprintf(buf, sizeof(buf), "Infinity");
@@ -919,7 +915,6 @@ static int json_object_double_to_json_string_format(struct json_object *jso, str
size = snprintf(buf, sizeof(buf), "-Infinity"); size = snprintf(buf, sizeof(buf), "-Infinity");
} }
else else
#endif
{ {
const char *std_format = "%.17g"; const char *std_format = "%.17g";
int format_drops_decimals = 0; int format_drops_decimals = 0;

7
math_compat.h
View File

@@ -12,6 +12,9 @@
#ifdef HAVE_DECL__ISNAN #ifdef HAVE_DECL__ISNAN
#include <float.h> #include <float.h>
#define isnan(x) _isnan(x) #define isnan(x) _isnan(x)
#else
/* On platforms like AIX and "IBM i" we need to provide our own isnan */
#define isnan(x) ((x) != (x))
#endif #endif
#endif #endif
@@ -19,6 +22,10 @@
#ifdef HAVE_DECL__FINITE #ifdef HAVE_DECL__FINITE
#include <float.h> #include <float.h>
#define isinf(x) (!_finite(x)) #define isinf(x) (!_finite(x))
#else
#include <float.h>
/* On platforms like AIX and "IBM i" we need to provide our own isinf */
#define isinf(x) ((x) < -DBL_MAX || (x) > DBL_MAX)
#endif #endif
#endif #endif