summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-09-15 13:17:15 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-09-15 13:17:15 (GMT)
commitcda189356e7e0a897377c3d7ed02ea3a3ad1de5a (patch)
tree7d99a186e2f0ebd2b149304729f6dfaacf9c3fe2
parentbe2bac558f1bed4b762e55f6f97fd70a6140520e (diff)
parent75644dafe54c21902f14cfe58cb8338b553b69d8 (diff)
downloadCMake-cda189356e7e0a897377c3d7ed02ea3a3ad1de5a.zip
CMake-cda189356e7e0a897377c3d7ed02ea3a3ad1de5a.tar.gz
CMake-cda189356e7e0a897377c3d7ed02ea3a3ad1de5a.tar.bz2
Merge topic 'jsoncpp-portability'
75644daf jsoncpp: Fix compilation as C99 on Solaris
-rw-r--r--Utilities/cmjsoncpp/src/lib_json/json_writer.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/Utilities/cmjsoncpp/src/lib_json/json_writer.cpp b/Utilities/cmjsoncpp/src/lib_json/json_writer.cpp
index b64cdb0..e3f4e53 100644
--- 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