From 1059f9a96da377af771fe643abc1d060db6d64bb Mon Sep 17 00:00:00 2001 From: Earle Lowe Date: Tue, 2 Jul 2019 18:20:41 -0400 Subject: jsoncpp: Fix compilation on HP-UX 11.31 ia64 with GCC 4.9.3 In particular, fix the `isfinite` definition. --- Utilities/cmjsoncpp/src/lib_json/json_writer.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Utilities/cmjsoncpp/src/lib_json/json_writer.cpp b/Utilities/cmjsoncpp/src/lib_json/json_writer.cpp index 6e6e57e..fc86505 100644 --- a/Utilities/cmjsoncpp/src/lib_json/json_writer.cpp +++ b/Utilities/cmjsoncpp/src/lib_json/json_writer.cpp @@ -30,7 +30,7 @@ #define isfinite finite #endif #elif defined(__hpux) -#if !defined(isfinite) +#if !defined(isfinite) && !defined(__GNUC__) #if defined(__ia64) && !defined(finite) #define isfinite(x) ((sizeof(x) == sizeof(float) ? \ _Isfinitef(x) : _IsFinite(x))) @@ -86,10 +86,11 @@ // HP-UX #if defined(__hpux) # if !defined(isfinite) -# if defined(__ia64) && !defined(finite) +# if defined(__ia64) && !defined(finite) && !defined(__GNUC__) # define isfinite(x) ((sizeof(x) == sizeof(float) ? \ _Isfinitef(x) : _Isfinite(x))) # else +# include # define isfinite finite # endif # endif -- cgit v0.12