Cleanup some defines and includes.

diff --git a/src/daemon/collectd.h b/src/daemon/collectd.h
index 2231195..0558aa4 100644 (file)
--- a/src/daemon/collectd.h
+++ b/src/daemon/collectd.h
@@ -186,10 +186,6 @@
 #include <sys/param.h>
 #endif
 
-#if HAVE_KSTAT_H
-#include <kstat.h>
-#endif
-
 #ifndef PACKAGE_NAME
 #define PACKAGE_NAME "collectd"
 #endif

diff --git a/src/daemon/globals.c b/src/daemon/globals.c
index bde7eb2..b720cd8 100644 (file)
--- a/src/daemon/globals.c
+++ b/src/daemon/globals.c
@@ -23,16 +23,16 @@
 
 #include "common.h"
 #include "globals.h"
-#include "plugin.h"
 
 void hostname_set(char const *hostname) {
   sstrncpy(hostname_g, hostname, sizeof(hostname_g));
 }
 
+/*
+ * Global variables
+ */
 char *hostname_g;
 cdtime_t interval_g;
-int  pidfile_from_cli = 0;
 int  timeout_g;
-#if HAVE_LIBKSTAT
 kstat_ctl_t *kc;
-#endif /* HAVE_LIBKSTAT */
+

diff --git a/src/daemon/globals.h b/src/daemon/globals.h
index 5870031..b4eb5f6 100644 (file)
--- a/src/daemon/globals.h
+++ b/src/daemon/globals.h
@@ -26,6 +26,14 @@
 
 #include <inttypes.h>
 
+#if HAVE_KSTAT_H
+#include <kstat.h>
+#endif
+
+#ifndef DATA_MAX_NAME_LEN
+#define DATA_MAX_NAME_LEN 128
+#endif
+
 /* Type for time as used by "utils_time.h" */
 typedef uint64_t cdtime_t;
 

diff --git a/src/daemon/plugin.h b/src/daemon/plugin.h
index 4f877e0..095d662 100644 (file)
--- a/src/daemon/plugin.h
+++ b/src/daemon/plugin.h
@@ -36,10 +36,6 @@
 
 #include <pthread.h>
 
-#ifndef DATA_MAX_NAME_LEN
-#define DATA_MAX_NAME_LEN 128
-#endif
-
 #define DS_TYPE_COUNTER 0
 #define DS_TYPE_GAUGE 1
 #define DS_TYPE_DERIVE 2