do NOT assume that FP_* is defined, it can also be a typedef enum ... bug report...

git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@2100 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/src/rrd_config_bottom.h b/src/rrd_config_bottom.h
index 48a2db2..4bf9d9c 100644 (file)
--- a/src/rrd_config_bottom.h
+++ b/src/rrd_config_bottom.h
@@ -170,7 +170,7 @@ char *strchr (), *strrchr ();
 #endif
 
 /* for Solaris */
 #endif
 
 /* for Solaris */

-#if (! defined(HAVE_ISINF) && defined(HAVE_FPCLASS) && defined(FP_NINF) && defined(FP_PINF)) 
+#if (! defined(HAVE_ISINF) && defined(HAVE_FPCLASS)) 

 # define HAVE_ISINF 1
 # ifdef isinf
 #  undef isinf
 # define HAVE_ISINF 1
 # ifdef isinf
 #  undef isinf


@@ -179,23 +179,23 @@ char *strchr (), *strrchr ();
 #endif
 
 /* solaris 10 it defines isnan such that only forte can compile it ... bad bad  */
 #endif
 
 /* solaris 10 it defines isnan such that only forte can compile it ... bad bad  */

-#if (defined(HAVE_ISNAN) && defined(isnan) && defined(HAVE_FPCLASS) && defined(FP_SNAN) && defined(FP_QNAN))
+#if (defined(HAVE_ISNAN) && defined(isnan) && defined(HAVE_FPCLASS))

 #  undef isnan
 #  define isnan(a) (fpclass(a) == FP_SNAN || fpclass(a) == FP_QNAN)
 #endif
 
 /* for OSF1 Digital Unix */
 #  undef isnan
 #  define isnan(a) (fpclass(a) == FP_SNAN || fpclass(a) == FP_QNAN)
 #endif
 
 /* for OSF1 Digital Unix */

-#if (! defined(HAVE_ISINF) && defined(HAVE_FP_CLASS) && defined(HAVE_FP_CLASS_H) && defined(FP_NEG_INF) && defined( FP_POS_INF))
+#if (! defined(HAVE_ISINF) && defined(HAVE_FP_CLASS) && defined(HAVE_FP_CLASS_H))

 #  define HAVE_ISINF 1
 #  define isinf(a) (fp_class(a) == FP_NEG_INF || fp_class(a) == FP_POS_INF)
 #endif
 
 #  define HAVE_ISINF 1
 #  define isinf(a) (fp_class(a) == FP_NEG_INF || fp_class(a) == FP_POS_INF)
 #endif
 

-#if (! defined(HAVE_ISINF) && defined(HAVE_FPCLASSIFY) && defined(FP_PLUS_INF) && defined(FP_MINUS_INF))
+#if (! defined(HAVE_ISINF) && defined(HAVE_FPCLASSIFY))

 #  define HAVE_ISINF 1
 #  define isinf(a) (fpclassify(a) == FP_MINUS_INF || fpclassify(a) == FP_PLUS_INF)
 #endif
 
 #  define HAVE_ISINF 1
 #  define isinf(a) (fpclassify(a) == FP_MINUS_INF || fpclassify(a) == FP_PLUS_INF)
 #endif
 

-#if (! defined(HAVE_ISINF) && defined(HAVE_FPCLASSIFY) && defined(FP_INFINITE))
+#if (! defined(HAVE_ISINF) && defined(HAVE_FPCLASSIFY))

 #  define HAVE_ISINF 1
 #  define isinf(a) (fpclassify(a) == FP_INFINITE)
 #endif
 #  define HAVE_ISINF 1
 #  define isinf(a) (fpclassify(a) == FP_INFINITE)
 #endif