[Pspp-cvs] pspp/src/libpspp ChangeLog misc.h

[Ben Pfaff]

CVSROOT:        /cvsroot/pspp
Module name:    pspp
Changes by:     Ben Pfaff <blp> 07/02/07 04:01:59

Modified files:
        src/libpspp    : ChangeLog misc.h 

Log message:
        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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/libpspp/ChangeLog?cvsroot=pspp&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/pspp/src/libpspp/misc.h?cvsroot=pspp&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/libpspp/ChangeLog,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- ChangeLog   7 Feb 2007 04:00:09 -0000       1.51
+++ ChangeLog   7 Feb 2007 04:01:59 -0000       1.52
@@ -1,3 +1,11 @@
+Tue Feb  6 20:00:13 2007  Ben Pfaff  <address@hidden>
+
+       * 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  <address@hidden>
 
        * compiler.h (PRINTF_FORMAT): Use __printf__ instead of printf to

Index: misc.h
===================================================================
RCS file: /cvsroot/pspp/pspp/src/libpspp/misc.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- misc.h      15 Dec 2006 00:16:03 -0000      1.4
+++ misc.h      7 Feb 2007 04:01:59 -0000       1.5
@@ -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. */