From 663fbfb7a4f697a1143bc613fd4153cf4640a5e5 Mon Sep 17 00:00:00 2001 From: firepick1 Date: Fri, 4 Apr 2014 17:28:08 -0700 Subject: [PATCH 1/3] SmartOS (Solaris) build --- src/value.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/value.c b/src/value.c index 644bc87..438a4de 100644 --- a/src/value.c +++ b/src/value.c @@ -29,8 +29,10 @@ /* Work around nonstandard isnan() and isinf() implementations */ #ifndef isnan +#ifndef sun static JSON_INLINE int isnan(double x) { return x != x; } #endif +#endif #ifndef isinf static JSON_INLINE int isinf(double x) { return !isnan(x) && isnan(x - x); } #endif From 33e498818017d28ecd1e5aa52382a00dcf66c533 Mon Sep 17 00:00:00 2001 From: Karl Lew Date: Sun, 6 Apr 2014 04:28:52 +0000 Subject: [PATCH 2/3] SmartOS build fix --- .gitignore | 1 + src/value.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index b2137d6..e6533b4 100644 --- a/.gitignore +++ b/.gitignore @@ -28,5 +28,6 @@ stamp-h1 *.pc /src/jansson_config.h /jansson_private_config.h.in +/jansson_private_config.h /build *.exe diff --git a/src/value.c b/src/value.c index 644bc87..438a4de 100644 --- a/src/value.c +++ b/src/value.c @@ -29,8 +29,10 @@ /* Work around nonstandard isnan() and isinf() implementations */ #ifndef isnan +#ifndef sun static JSON_INLINE int isnan(double x) { return x != x; } #endif +#endif #ifndef isinf static JSON_INLINE int isinf(double x) { return !isnan(x) && isnan(x - x); } #endif From 571617ebfc7bda478a877cb468ec7d486acd7029 Mon Sep 17 00:00:00 2001 From: Karl Lew Date: Tue, 8 Apr 2014 15:57:58 +0000 Subject: [PATCH 3/3] use __sun instead of sun --- src/value.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/value.c b/src/value.c index 438a4de..333d0af 100644 --- a/src/value.c +++ b/src/value.c @@ -29,7 +29,7 @@ /* Work around nonstandard isnan() and isinf() implementations */ #ifndef isnan -#ifndef sun +#ifndef __sun static JSON_INLINE int isnan(double x) { return x != x; } #endif #endif