X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcollectd.h;h=7cb405c04bd43d25ec6b807f730419cbf39a93bb;hb=33e60ef35f745c56b1a5936272b1dd8b0cf63d12;hp=18052ba3980130caa048b3b5768de5915c0f9f93;hpb=a1ae4b5afaf3207a7070b85f802b41b32c0b9a20;p=collectd.git diff --git a/src/collectd.h b/src/collectd.h index 18052ba3..7cb405c0 100644 --- a/src/collectd.h +++ b/src/collectd.h @@ -56,9 +56,6 @@ #if HAVE_STDINT_H # include #endif -#if HAVE_STDBOOL_H -# include -#endif #if HAVE_UNISTD_H # include #endif @@ -100,6 +97,12 @@ # define assert(...) /* nop */ #endif +#if !defined(HAVE__BOOL) || !HAVE__BOOL +typedef int _Bool; +# undef HAVE__BOOL +# define HAVE__BOOL 1 +#endif + #if NAN_STATIC_DEFAULT # include /* #endif NAN_STATIC_DEFAULT*/ @@ -123,6 +126,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 +218,6 @@ # include #endif -#if HAVE_SENSORS_SENSORS_H -# include -#endif - #ifndef PACKAGE_NAME #define PACKAGE_NAME "collectd" #endif @@ -253,7 +258,9 @@ # define COLLECTD_GRP_NAME "collectd" #endif -#define STATIC_ARRAY_LEN(array) (sizeof (array) / sizeof ((array)[0])) +#ifndef COLLECTD_DEFAULT_INTERVAL +# define COLLECTD_DEFAULT_INTERVAL 10.0 +#endif /* Remove GNU specific __attribute__ settings when using another compiler */ #if !__GNUC__ @@ -280,7 +287,11 @@ # endif #endif -extern char hostname_g[]; -extern int interval_g; +/* Type for time as used by "utils_time.h" */ +typedef uint64_t cdtime_t; + +extern char hostname_g[]; +extern cdtime_t interval_g; +extern int timeout_g; #endif /* COLLECTD_H */