projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
curl_xml plugin: Fix memory leak.
[collectd.git]
/
src
/
collectd.h
diff --git
a/src/collectd.h
b/src/collectd.h
index
24e5add
..
1b1bc49
100644
(file)
--- a/
src/collectd.h
+++ b/
src/collectd.h
@@
-56,9
+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>
-#endif
#if HAVE_UNISTD_H
# include <unistd.h>
#endif
#if HAVE_UNISTD_H
# include <unistd.h>
#endif
@@
-100,6
+97,12
@@
# 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*/
@@
-123,6
+126,12
@@
# ifndef isnan
# define isnan(f) ((f) != (f))
# endif /* !defined(isnan) */
# 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
#endif /* NAN_ZERO_ZERO */
/* Try really, really hard to determine endianess. Under NexentaStor 1.0.2 this
@@
-209,10
+218,6
@@
# 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
@@
-253,7
+258,9
@@
# 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__
@@
-261,6
+268,9
@@
#endif
#if defined(COLLECT_DEBUG) && COLLECT_DEBUG && defined(__GNUC__) && __GNUC__
#endif
#if defined(COLLECT_DEBUG) && COLLECT_DEBUG && defined(__GNUC__) && __GNUC__
+# undef strcpy
+# undef strcat
+# undef strtok
# pragma GCC poison strcpy strcat strtok
#endif
# pragma GCC poison strcpy strcat strtok
#endif
@@
-272,11
+282,20
@@
*/
#ifndef DONT_POISON_SPRINTF_YET
# if defined(COLLECT_DEBUG) && COLLECT_DEBUG && defined(__GNUC__) && __GNUC__
*/
#ifndef DONT_POISON_SPRINTF_YET
# if defined(COLLECT_DEBUG) && COLLECT_DEBUG && defined(__GNUC__) && __GNUC__
+# undef sprintf
# pragma GCC poison sprintf
# endif
#endif
# pragma GCC poison sprintf
# endif
#endif
-extern char hostname_g[];
-extern int interval_g;
+#ifndef GAUGE_FORMAT
+# define GAUGE_FORMAT "%.15g"
+#endif
+
+/* 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 */