projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Auto-Merge pull request #2784 from rpv-tomsk/fix-5.8
[collectd.git]
/
src
/
daemon
/
collectd.h
diff --git
a/src/daemon/collectd.h
b/src/daemon/collectd.h
index
38ffd0f
..
0558aa4
100644
(file)
--- a/
src/daemon/collectd.h
+++ b/
src/daemon/collectd.h
@@
-186,10
+186,6
@@
#include <sys/param.h>
#endif
#include <sys/param.h>
#endif
-#if HAVE_KSTAT_H
-#include <kstat.h>
-#endif
-
#ifndef PACKAGE_NAME
#define PACKAGE_NAME "collectd"
#endif
#ifndef PACKAGE_NAME
#define PACKAGE_NAME "collectd"
#endif
@@
-240,10
+236,8
@@
/* Only enable __attribute__() for compilers known to support it. */
#if !defined(__clang__) && !defined(__GNUC__)
/* Only enable __attribute__() for compilers known to support it. */
#if !defined(__clang__) && !defined(__GNUC__)
-#if !defined(__attribute__)
#define __attribute__(x) /**/
#endif
#define __attribute__(x) /**/
#endif
-#endif
#if defined(COLLECT_DEBUG) && COLLECT_DEBUG && defined(__GNUC__) && __GNUC__
#undef strcpy
#if defined(COLLECT_DEBUG) && COLLECT_DEBUG && defined(__GNUC__) && __GNUC__
#undef strcpy
@@
-269,11
+263,6
@@
#define GAUGE_FORMAT "%.15g"
#endif
#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;
+#include "globals.h"
#endif /* COLLECTD_H */
#endif /* COLLECTD_H */