rrdtool plugin: Include the `rrd.h' header file in `rrdtool.c', not `collectd.h'.

[collectd.git] / src / collectd.h

diff --git a/src/collectd.h b/src/collectd.h
index e1ce97c..2849db2 100644 (file)
--- 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