Merge topic 'jsoncpp-portability'

75644daf jsoncpp: Fix compilation as C99 on Solaris
2015-09-15 09:17:15 -04:00 · 2015-09-15 09:17:15 -04:00 · cda189356e
parent be2bac558f 75644dafe5
commit cda189356e
1 changed files with 3 additions and 1 deletions
--- a/Utilities/cmjsoncpp/src/lib_json/json_writer.cpp
+++ b/Utilities/cmjsoncpp/src/lib_json/json_writer.cpp
@ -24,7 +24,9 @@
 // Solaris
 #if defined(__sun)
 # include <ieeefp.h>
-# define isfinite finite
+# if !defined(isfinite)
+#  define isfinite finite
+# endif
 #endif

 // AIX