X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcollectd.h;h=9951d8a91013d929bc831a4e40ad49b9bce08893;hb=1297a3723f6c5a79e8148e56c249a1aa7d3c6f35;hp=e1ce97c1bf17cf13f2272dd56c45b306bd93d545;hpb=dc80c73c20ef0e69c3850fd9679a827ad79e61a1;p=collectd.git

diff --git a/src/collectd.h b/src/collectd.h
index e1ce97c1..9951d8a9 100644
--- a/src/collectd.h
+++ b/src/collectd.h
@@ -23,7 +23,7 @@
 #define COLLECTD_H
 
 #if HAVE_CONFIG_H
-# include <config.h>
+# include "config.h"
 #endif
 
 #include <stdio.h>
@@ -113,6 +113,9 @@
 /* #endif NAN_STATIC_ISOC */
 #elif NAN_ZERO_ZERO
 # include <math.h>
+# ifdef NAN
+#  undef NAN
+# endif
 # define NAN (0.0 / 0.0)
 # ifndef isnan
 #  define isnan(f) ((f) != (f))
@@ -150,9 +153,6 @@
 # include <kstat.h>
 #endif
 
-#if HAVE_RRD_H
-# include <rrd.h>
-#endif
 #if HAVE_PTH_H
 # include <pth.h>
 #endif
@@ -179,6 +179,10 @@
 #define CONFIGFILE SYSCONFDIR"/collectd.conf"
 #endif
 
+#ifndef LOCALSTATEDIR
+#define LOCALSTATEDIR PREFIX "/var"
+#endif
+
 #ifndef PKGLOCALSTATEDIR
 #define PKGLOCALSTATEDIR PREFIX "/var/lib/" PACKAGE_NAME
 #endif
@@ -191,11 +195,6 @@
 #define PLUGINDIR PREFIX "/lib/" PACKAGE_NAME
 #endif
 
-#define MODE_SERVER 0x01
-#define MODE_CLIENT 0x02
-#define MODE_LOCAL  0x04
-#define MODE_LOG    0x08
-
 #ifndef COLLECTD_GRP_NAME
 # define COLLECTD_GRP_NAME "collectd"
 #endif