make sure all elements required in the definition of isinf are defined in their turn

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

diff --git a/program/m4/acinclude.m4 b/program/m4/acinclude.m4
index c1e5c4bd9d3adea7155dfc3b5e964c06842a103d..01eb4a41314c13686b811b4e332240c256a99dcc 100644 (file)
--- a/program/m4/acinclude.m4
+++ b/program/m4/acinclude.m4
@@ -363,13 +363,13 @@ AC_CACHE_VAL([rd_cv_ieee_$2],
 #endif
 
 /* solaris 10 it defines isnan such that only forte can compile it ... bad bad  */
-#if (defined(HAVE_ISNAN) && defined(isnan) && defined(HAVE_FPCLASS))
+#if (defined(HAVE_ISNAN) && defined(isnan) && defined(HAVE_FPCLASS) && defined(FP_SNAN) && defined(FP_QNAN))
 #  undef isnan
 #  define isnan(a) (fpclass(a) == FP_SNAN || fpclass(a) == FP_QNAN)
 #endif
 
 /* Digital UNIX */
-#if (! defined(HAVE_ISINF) && defined(HAVE_FP_CLASS) && defined(HAVE_FP_CLASS_H))
+#if (! defined(HAVE_ISINF) && defined(HAVE_FP_CLASS) && defined(HAVE_FP_CLASS_H) && defined(FP_NEG_INF) && defined( FP_POS_INF) )
 #  define HAVE_ISINF 1
 #  define isinf(a) (fp_class(a) == FP_NEG_INF || fp_class(a) == FP_POS_INF)
 #endif 

diff --git a/program/src/rrd_config_bottom.h b/program/src/rrd_config_bottom.h
index ec191b9e0f7ced35c116061c9a02b9be474d7ef9..d04e592af13f56088cc10d88509201713506b934 100644 (file)
--- a/program/src/rrd_config_bottom.h
+++ b/program/src/rrd_config_bottom.h
@@ -179,13 +179,13 @@ char *strchr (), *strrchr ();
 #endif
 
 /* solaris 10 it defines isnan such that only forte can compile it ... bad bad  */
-#if (defined(HAVE_ISNAN) && defined(isnan) && defined(HAVE_FPCLASS))
+#if (defined(HAVE_ISNAN) && defined(isnan) && defined(HAVE_FPCLASS) && defined(FP_SNAN) && defined(FP_QNAN))
 #  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))
+#if (! defined(HAVE_ISINF) && defined(HAVE_FP_CLASS) && defined(HAVE_FP_CLASS_H) && defined(FP_NEG_INF) && defined( FP_POS_INF))
 #  define HAVE_ISINF 1
 #  define isinf(a) (fp_class(a) == FP_NEG_INF || fp_class(a) == FP_POS_INF)
 #endif