X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcollectd.h;h=c05b3e7bba65d543f17bcad77d35d92037ad2b43;hb=b8be503b2b50366a9c498ba7e4ab66a228c6dfbf;hp=582d524a50fa563bfea95d5a3345c4022ef3b5b4;hpb=cc0d31accbf4f5543693ec7001088d887fb732d2;p=collectd.git

diff --git a/src/collectd.h b/src/collectd.h
index 582d524a..c05b3e7b 100644
--- a/src/collectd.h
+++ b/src/collectd.h
@@ -1,11 +1,10 @@
 /**
  * collectd - src/collectd.h
- * Copyright (C) 2005  Florian octo Forster
+ * Copyright (C) 2005,2006  Florian octo Forster
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
+ * Free Software Foundation; only version 2 of the License is applicable.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -101,6 +100,20 @@
 # define assert(...) /* nop */
 #endif
 
+/*
+ * This weird macro cascade forces the glibc to define `NAN'. I don't know
+ * another way to solve this, so more intelligent solutions are welcome. -octo
+ */
+#ifndef __USE_ISOC99
+# define DISABLE__USE_ISOC99 1
+# define __USE_ISOC99 1
+#endif
+#include <math.h>
+#ifdef DISABLE__USE_ISOC99
+# undef DISABLE__USE_ISOC99
+# undef __USE_ISOC99
+#endif
+
 #if HAVE_DIRENT_H
 # include <dirent.h>
 # define NAMLEN(dirent) strlen((dirent)->d_name)
@@ -128,19 +141,7 @@
 # include <sys/param.h>
 #endif
 
-#if HAVE_SYSLOG
-# define syslog(...) syslog(__VA_ARGS__)
-# if HAVE_OPENLOG
-#  define openlog(...) openlog(__VA_ARGS__)
-# else
-#  define openlog(...) /**/
-# endif
-# if HAVE_CLOSELOG
-#  define closelog(...) closelog(__VA_ARGS__)
-# else
-#  define closelog(...) /**/
-# endif
-#else
+#if !HAVE_SYSLOG
 # define syslog(...) /**/
 # define openlog(...) /**/
 # define closelog(...) /**/
@@ -198,6 +199,11 @@
 #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"