From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Thu, 25 Oct 2007 21:11:54 +0000 (+0200)
Subject: rrdtool plugin: Include the `rrd.h' header file in `rrdtool.c', not `collectd.h'.
X-Git-Tag: collectd-4.2.0~1^2~4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=febe816d5cf4dff6c35936fd3c5ced8e49ca6ee8;p=collectd.git

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

This caused an error when --with-rrdtool was used to have the header file in a
non-standard directory, because the appropriate CFLAGS were not passed to all
plugins.
---

diff --git a/src/collectd.h b/src/collectd.h
index 282e6325..2849db27 100644
--- a/src/collectd.h
+++ b/src/collectd.h
@@ -153,9 +153,6 @@
 # include <kstat.h>
 #endif
 
-#if HAVE_RRD_H
-# include <rrd.h>
-#endif
 #if HAVE_PTH_H
 # include <pth.h>
 #endif
diff --git a/src/rrdtool.c b/src/rrdtool.c
index 9fc68728..36885817 100644
--- a/src/rrdtool.c
+++ b/src/rrdtool.c
@@ -24,6 +24,8 @@
 #include "common.h"
 #include "utils_avltree.h"
 
+#include <rrd.h>
+
 #if HAVE_PTHREAD_H
 # include <pthread.h>
 #endif