Common stuff now builds as a library.

[collectd.git] / src / daemon / collectd.h

diff --git a/src/daemon/collectd.h b/src/daemon/collectd.h
index 38ffd0f..2231195 100644 (file)
--- 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 */