Define isinf macro only if it is not defined as a macro, even if

!HAVE_ISINF, because mingw seems to have the macro without the
function.

diff --git a/src/libpspp/ChangeLog b/src/libpspp/ChangeLog
index 5fcc9df9bad03d0e807ea48854cc1b2a85b123ed..2e5ac512c397010cf9350e6470b915ec082bba9a 100644 (file)
--- a/src/libpspp/ChangeLog
+++ b/src/libpspp/ChangeLog
@@ -1,3 +1,11 @@
+Tue Feb  6 20:00:13 2007  Ben Pfaff  <blp@gnu.org>
+
+       * misc.h [!HAVE_ISINF] (isinf): Define only if isinf is not
+       defined as a macro, because mingw seems to have the macro without
+       the function.
+       [!HAVE_ISNAN] (isnan): Ditto, for symmetry only.
+       [!AHVE_FINITE] (finite): Ditto, for symmetry only.
+
 Tue Feb  6 19:58:46 2007  Ben Pfaff  <blp@gnu.org>
 
        * compiler.h (PRINTF_FORMAT): Use __printf__ instead of printf to

diff --git a/src/libpspp/misc.h b/src/libpspp/misc.h
index 2d30bddcc246c94cc698a7cd4ccb8fcb4a7cb542..39aa535ec360821a28771bd4bf64a3f6c6d36e5a 100644 (file)
--- a/src/libpspp/misc.h
+++ b/src/libpspp/misc.h
@@ -26,17 +26,17 @@
 
 /* HUGE_VAL is traditionally defined as positive infinity, or
    alternatively, DBL_MAX. */
-#if !HAVE_ISINF
+#if !HAVE_ISINF && !defined (isinf)
 #define isinf(X) (fabs (X) == HUGE_VAL)
 #endif
 
 /* A Not a Number is not equal to itself. */
-#if !HAVE_ISNAN
+#if !HAVE_ISNAN && !defined (isnan)
 #define isnan(X) ((X) != (X))
 #endif
 
 /* Finite numbers are not infinities or NaNs. */
-#if !HAVE_FINITE
+#if !HAVE_FINITE && !defined (finite)
 #define finite(X) (!isinf (X) && !isnan (X))
 #elif HAVE_IEEEFP_H
 #include <ieeefp.h>            /* Declares finite() under Solaris. */