projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
plugin: Use strcasecmp rather than strncasecmp to find a plugin.
[collectd.git]
/
src
/
collectd.h
diff --git
a/src/collectd.h
b/src/collectd.h
index
8849b30
..
7cb405c
100644
(file)
--- a/
src/collectd.h
+++ b/
src/collectd.h
@@
-56,21
+56,6
@@
#if HAVE_STDINT_H
# include <stdint.h>
#endif
#if HAVE_STDINT_H
# include <stdint.h>
#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>
#endif
#if HAVE_UNISTD_H
# include <unistd.h>
#endif
@@
-112,6
+97,12
@@
typedef bool _Bool;
# define assert(...) /* nop */
#endif
# 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 <math.h>
/* #endif NAN_STATIC_DEFAULT*/
#if NAN_STATIC_DEFAULT
# include <math.h>
/* #endif NAN_STATIC_DEFAULT*/
@@
-227,10
+218,6
@@
typedef bool _Bool;
# include <kstat.h>
#endif
# include <kstat.h>
#endif
-#if HAVE_SENSORS_SENSORS_H
-# include <sensors/sensors.h>
-#endif
-
#ifndef PACKAGE_NAME
#define PACKAGE_NAME "collectd"
#endif
#ifndef PACKAGE_NAME
#define PACKAGE_NAME "collectd"
#endif
@@
-271,7
+258,9
@@
typedef bool _Bool;
# define COLLECTD_GRP_NAME "collectd"
#endif
# 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__
/* Remove GNU specific __attribute__ settings when using another compiler */
#if !__GNUC__
@@
-298,8
+287,11
@@
typedef bool _Bool;
# endif
#endif
# endif
#endif
-extern char hostname_g[];
-extern int interval_g;
-extern int timeout_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 */
#endif /* COLLECTD_H */