X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcollectd.h;h=277a610fe75a62e3c20bf90fd1df509d6afd1514;hb=4027126a75439c7d2b1d5572092fd291ef19ead6;hp=0df763ec397d9340ea020f444bbc44cea32c1478;hpb=fbf19197157cee85e6b10de37dffdb462ebeff12;p=collectd.git

diff --git a/src/collectd.h b/src/collectd.h
index 0df763ec..277a610f 100644
--- a/src/collectd.h
+++ b/src/collectd.h
@@ -203,9 +203,6 @@
 # include <kstat.h>
 #endif
 
-#if HAVE_PTH_H
-# include <pth.h>
-#endif
 #if HAVE_SENSORS_SENSORS_H
 # include <sensors/sensors.h>
 #endif
@@ -242,6 +239,10 @@
 #define PLUGINDIR PREFIX "/lib/" PACKAGE_NAME
 #endif
 
+#ifndef PKGDATADIR
+#define PKGDATADIR PREFIX "/share/" PACKAGE_NAME
+#endif
+
 #ifndef COLLECTD_GRP_NAME
 # define COLLECTD_GRP_NAME "collectd"
 #endif
@@ -253,6 +254,26 @@
 # define __attribute__(x) /**/
 #endif
 
+#if defined(COLLECT_DEBUG) && COLLECT_DEBUG && defined(__GNUC__) && __GNUC__
+# undef strcpy
+# undef strcat
+# undef strtok
+# pragma GCC poison strcpy strcat strtok
+#endif
+
+/* 
+ * Special hack for the perl plugin: Because the later included perl.h defines
+ * a macro which is never used, but contains `sprintf', we cannot poison that
+ * identifies just yet. The parl plugin will do that itself once perl.h is
+ * included.
+ */
+#ifndef DONT_POISON_SPRINTF_YET
+# if defined(COLLECT_DEBUG) && COLLECT_DEBUG && defined(__GNUC__) && __GNUC__
+#  undef sprintf
+#  pragma GCC poison sprintf
+# endif
+#endif
+
 extern char hostname_g[];
 extern int  interval_g;