X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcollectd.h;h=4079ad1f2872c4d70aa708f0c523b3aed1f517fb;hb=28f252c4c5c879991c4c59ac5a4bb80c5d209eb5;hp=31aae54098a6c771767382af0bf8868811c1e1b1;hpb=5c8d44f831b549cfd6e47db39181fd5a1d9cd5b2;p=collectd.git diff --git a/src/collectd.h b/src/collectd.h index 31aae540..4079ad1f 100644 --- a/src/collectd.h +++ b/src/collectd.h @@ -56,21 +56,6 @@ #if HAVE_STDINT_H # include #endif -#if HAVE_STDBOOL_H -# include -#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 #endif @@ -112,6 +97,12 @@ typedef bool _Bool; # 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*/ @@ -294,7 +285,11 @@ typedef bool _Bool; # 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 */