From f0a82ae15cafb6ad47ea0c9f74754820e92e2078 Mon Sep 17 00:00:00 2001 From: oetiker Date: Fri, 21 Aug 2009 05:03:40 +0000 Subject: [PATCH] make sure all elements required in the definition of isinf are defined in their turn git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@1902 a5681a0c-68f1-0310-ab6d-d61299d08faa --- m4/acinclude.m4 | 4 ++-- src/rrd_config_bottom.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 index c1e5c4b..01eb4a4 100644 --- a/m4/acinclude.m4 +++ b/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/src/rrd_config_bottom.h b/src/rrd_config_bottom.h index ec191b9..d04e592 100644 --- a/src/rrd_config_bottom.h +++ b/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 -- 2.11.0