Merged changes on `processes.c', `collectd.c' and `collectd.h' from quota-branch...

[collectd.git] / src / collectd.h

diff --git a/src/collectd.h b/src/collectd.h
index 57b709c..1614483 100644 (file)
--- a/src/collectd.h
+++ b/src/collectd.h
@@ -2,7 +2,7 @@
 #define COLLECTD_H
 
 #if HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdio.h>
@@ -38,13 +38,64 @@
 #if HAVE_UNISTD_H
 # include <unistd.h>
 #endif
-#include <sys/wait.h>
-#include <signal.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <syslog.h>
-#include <limits.h>
-#include <time.h>
+#if HAVE_SYS_WAIT_H
+# include <sys/wait.h>
+#endif
+#ifndef WEXITSTATUS
+# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8)
+#endif
+#ifndef WIFEXITED
+# define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
+#endif
+#if HAVE_SIGNAL_H
+# include <signal.h>
+#endif
+#if HAVE_FCNTL_H
+# include <fcntl.h>
+#endif
+#if HAVE_ERRNO_H
+# include <errno.h>
+#endif
+#if HAVE_SYSLOG_H
+# include <syslog.h>
+#endif
+#if HAVE_LIMITS_H
+# include <limits.h>
+#endif
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
+#if HAVE_DIRENT_H
+# include <dirent.h>
+# define NAMLEN(dirent) strlen((dirent)->d_name)
+#else
+# define dirent direct
+# define NAMLEN(dirent) (dirent)->d_namlen
+# if HAVE_SYS_NDIR_H
+#  include <sys/ndir.h>
+# endif
+# if HAVE_SYS_DIR_H
+#  include <sys/dir.h>
+# endif
+# if HAVE_NDIR_H
+#  include <ndir.h>
+# endif
+#endif
+
+#if HAVE_STDARG_H
+# include <stdarg.h>
+#endif
+#if HAVE_CTYPE_H
+# include <ctype.h>
+#endif
 
 #ifndef HAVE_RRD_H
 #undef HAVE_LIBRRD
@@ -73,10 +124,6 @@
 #include <statgrab.h>
 #endif
 
-#ifndef DEBUG
-#define DEBUG 0
-#endif
-
 #ifndef LOCALSTATEDIR
 #define LOCALSTATEDIR "/opt/collectd/var"
 #endif
@@ -97,4 +144,7 @@
 #define MODE_CLIENT 0x02
 #define MODE_LOCAL  0x03
 
+extern time_t curtime;
+extern int operating_mode;
+
 #endif /* COLLECTD_H */