diff --git a/src/collectd.h b/src/collectd.h
index 7bf2f565a9e2024f1fe4b98187bd3451a22e3f42..9951d8a91013d929bc831a4e40ad49b9bce08893 100644 (file)
--- a/src/collectd.h
+++ b/src/collectd.h
#define COLLECTD_H
#if HAVE_CONFIG_H
-# include <config.h>
+# include "config.h"
#endif
#include <stdio.h>
#if HAVE_ERRNO_H
# include <errno.h>
#endif
-#if HAVE_SYSLOG_H
-# include <syslog.h>
-#endif
#if HAVE_LIMITS_H
# include <limits.h>
#endif
/* #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))
# include <sys/param.h>
#endif
-#if !HAVE_SYSLOG
-# define syslog(...) /**/
-# define openlog(...) /**/
-# define closelog(...) /**/
-#endif
-
#if HAVE_KSTAT_H
# include <kstat.h>
#endif
-#if HAVE_RRD_H
-# include <rrd.h>
-#endif
#if HAVE_PTH_H
# include <pth.h>
#endif
#define CONFIGFILE SYSCONFDIR"/collectd.conf"
#endif
+#ifndef LOCALSTATEDIR
+#define LOCALSTATEDIR PREFIX "/var"
+#endif
+
#ifndef PKGLOCALSTATEDIR
#define PKGLOCALSTATEDIR PREFIX "/var/lib/" PACKAGE_NAME
#endif
#define PIDFILE PREFIX "/var/run/" PACKAGE_NAME ".pid"
#endif
-#ifndef LOGFILE
-#define LOGFILE PREFIX"/var/log/"PACKAGE_NAME"/"PACKAGE_NAME".log"
-#endif
-
#ifndef PLUGINDIR
#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_STEP
-# define COLLECTD_STEP "10"
-#endif
-
-#ifndef COLLECTD_HEARTBEAT
-# define COLLECTD_HEARTBEAT "25"
-#endif
-
-#ifndef COLLECTD_ROWS
-# define COLLECTD_ROWS "1200"
-#endif
-
-#ifndef COLLECTD_XFF
-# define COLLECTD_XFF 0.1
-#endif
-
#define STATIC_ARRAY_LEN(array) (sizeof (array) / sizeof ((array)[0]))
extern char hostname_g[];