Merge pull request #2559 from WardF/gh2132.wif

Add fenceposting for HAVE_DECL_ISINF and HAVE_DECL_ISNAN

Author: WardF

CMakeLists.txt

@@ -1066,7 +1066,7 @@ IF(ENABLE_DAP)
 
   IF(NOT ENABLE_HDF5)
     SET(ENABLE_DAP4 OFF CACHE BOOL "")
-  ENDIF(ENABLE_HDF5)
+  ENDIF(NOT ENABLE_HDF5)
 
 ELSE()
   SET(ENABLE_DAP2 OFF CACHE BOOL "")

libdispatch/dutil.c

@@ -396,10 +396,12 @@ NC_testmode(NCURI* uri, const char* tag)
     return found;
 }
 
-#if ! defined __INTEL_COMPILER 
+#if ! defined __INTEL_COMPILER
 #if defined __APPLE__ 
 /** \internal */
 
+#if ! defined HAVE_DECL_ISINF
+
 int isinf(double x)
 {
     union { unsigned long long u; double f; } ieee754;
@@ -408,6 +410,9 @@ int isinf(double x)
            ( (unsigned)ieee754.u == 0 );
 }
 
+#endif /* HAVE_DECL_ISINF */
+
+#if ! defined HAVE_DECL_ISNAN
 /** \internal */
 int isnan(double x)
 {
@@ -417,6 +422,8 @@ int isnan(double x)
            ( (unsigned)ieee754.u != 0 ) > 0x7ff00000;
 }
 
+#endif /* HAVE_DECL_ISNAN */
+
 #endif /*APPLE*/
 #endif /*!_INTEL_COMPILER*/