projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-4.2'
[collectd.git]
/
src
/
collectd.h
diff --git
a/src/collectd.h
b/src/collectd.h
index
ac75516
..
9951d8a
100644
(file)
--- a/
src/collectd.h
+++ b/
src/collectd.h
@@
-153,9
+153,6
@@
# include <kstat.h>
#endif
# include <kstat.h>
#endif
-#if HAVE_RRD_H
-# include <rrd.h>
-#endif
#if HAVE_PTH_H
# include <pth.h>
#endif
#if HAVE_PTH_H
# include <pth.h>
#endif
@@
-182,6
+179,10
@@
#define CONFIGFILE SYSCONFDIR"/collectd.conf"
#endif
#define CONFIGFILE SYSCONFDIR"/collectd.conf"
#endif
+#ifndef LOCALSTATEDIR
+#define LOCALSTATEDIR PREFIX "/var"
+#endif
+
#ifndef PKGLOCALSTATEDIR
#define PKGLOCALSTATEDIR PREFIX "/var/lib/" PACKAGE_NAME
#endif
#ifndef PKGLOCALSTATEDIR
#define PKGLOCALSTATEDIR PREFIX "/var/lib/" PACKAGE_NAME
#endif
@@
-194,11
+195,6
@@
#define PLUGINDIR PREFIX "/lib/" PACKAGE_NAME
#endif
#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
#ifndef COLLECTD_GRP_NAME
# define COLLECTD_GRP_NAME "collectd"
#endif