Merge branch 'collectd-4.5' into collectd-4.6

[collectd.git] / src / collectd.h

diff --git a/src/collectd.h b/src/collectd.h
index 196530f..277a610 100644 (file)
--- a/src/collectd.h
+++ b/src/collectd.h
@@ -254,7 +254,10 @@
 # define __attribute__(x) /**/
 #endif
 
-#if __GNUC__
+#if defined(COLLECT_DEBUG) && COLLECT_DEBUG && defined(__GNUC__) && __GNUC__
+# undef strcpy
+# undef strcat
+# undef strtok
 # pragma GCC poison strcpy strcat strtok
 #endif
 
@@ -265,7 +268,8 @@
  * included.
  */
 #ifndef DONT_POISON_SPRINTF_YET
-# if __GNUC__
+# if defined(COLLECT_DEBUG) && COLLECT_DEBUG && defined(__GNUC__) && __GNUC__
+#  undef sprintf
 #  pragma GCC poison sprintf
 # endif
 #endif