X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdaemon%2Fcollectd.h;h=223119504be740141fd9a27850148f58bac93f10;hb=6b649799dedd72b783e3c24b485fbf3eabd6039e;hp=38ffd0f61e55726d8487af2f37f4057559293ca4;hpb=865f2eb31e8264edd9337bc63ac59f6c2fa3b5a7;p=collectd.git

diff --git a/src/daemon/collectd.h b/src/daemon/collectd.h
index 38ffd0f6..22311950 100644
--- a/src/daemon/collectd.h
+++ b/src/daemon/collectd.h
@@ -240,10 +240,8 @@
 
 /* Only enable __attribute__() for compilers known to support it. */
 #if !defined(__clang__) && !defined(__GNUC__)
-#if !defined(__attribute__)
 #define __attribute__(x) /**/
 #endif
-#endif
 
 #if defined(COLLECT_DEBUG) && COLLECT_DEBUG && defined(__GNUC__) && __GNUC__
 #undef strcpy
@@ -269,11 +267,6 @@
 #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 */