projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove duplicate code in rrd_open -- Richard Laager
[rrdtool.git]
/
src
/
rrd_config_bottom.h
diff --git
a/src/rrd_config_bottom.h
b/src/rrd_config_bottom.h
index
a569197
..
e7d0a38
100644
(file)
--- a/
src/rrd_config_bottom.h
+++ b/
src/rrd_config_bottom.h
@@
-170,28
+170,32
@@
char *strchr (), *strrchr ();
#endif
/* for Solaris */
#endif
/* for Solaris */
-#if (! defined(HAVE_ISINF) && defined(HAVE_FPCLASS))
-#
define HAVE_ISINF 1
-#
ifdef isinf
+#if (! defined(HAVE_ISINF) && defined(HAVE_FPCLASS))
+# define HAVE_ISINF 1
+# ifdef isinf
# undef isinf
# undef isinf
-# endif
-# define isinf(a) (!!(fpclass(a) & (FP_SNAN|FP_QNAN)))
+# endif
+# define isinf(a) (fpclass(a) == FP_NINF || fpclass(a) == FP_PINF)
+#endif
+/* solaris 8/9 has rint but not round */
+#if (! defined(HAVE_ROUND) && defined(HAVE_RINT))
+# define round rint
#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_MIN
US_INF))
+#if (! defined(HAVE_ISINF) && defined(HAVE_FPCLASSIFY) && defined(FP_
MINUS_INF) && defined(FP_PL
US_INF))
# 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