Merge branch 'collectd-4.9' into collectd-4.10

[collectd.git] / src / collectd.h

diff --git a/src/collectd.h b/src/collectd.h
index 18052ba..e7fc4e3 100644 (file)
--- a/src/collectd.h
+++ b/src/collectd.h
@@ -58,6 +58,18 @@
 #endif
 #if HAVE_STDBOOL_H
 # include <stdbool.h>
+#else
+# ifndef HAVE__BOOL
+#  ifdef __cplusplus
+typedef bool _Bool;
+#  else
+#   define _Bool signed char
+#  endif
+# endif
+# define bool _Bool
+# define false 0
+# define true 1
+# define __bool_true_false_are_defined 1
 #endif
 #if HAVE_UNISTD_H
 # include <unistd.h>
@@ -123,6 +135,12 @@
 # ifndef isnan
 #  define isnan(f) ((f) != (f))
 # endif /* !defined(isnan) */
+# ifndef isfinite
+#  define isfinite(f) (((f) - (f)) == 0.0)
+# endif
+# ifndef isinf
+#  define isinf(f) (!isfinite(f) && !isnan(f))
+# endif
 #endif /* NAN_ZERO_ZERO */
 
 /* Try really, really hard to determine endianess. Under NexentaStor 1.0.2 this
@@ -209,10 +227,6 @@
 # include <kstat.h>
 #endif
 
-#if HAVE_SENSORS_SENSORS_H
-# include <sensors/sensors.h>
-#endif
-
 #ifndef PACKAGE_NAME
 #define PACKAGE_NAME "collectd"
 #endif
@@ -282,5 +296,6 @@
 
 extern char hostname_g[];
 extern int  interval_g;
+extern int  timeout_g;
 
 #endif /* COLLECTD_H */