Merge branch 'collectd-4.6' into collectd-4.7

[collectd.git] / src / collectd.h

diff --git a/src/collectd.h b/src/collectd.h
index 24e5add..5a03919 100644 (file)
--- a/src/collectd.h
+++ b/src/collectd.h
@@ -26,6 +26,11 @@
 # include "config.h"
 #endif
 
+/* Set to C99 and POSIX code */
+#if COLLECT_STANDARDS
+# include "standards.h"
+#endif /* COLLECT_STANDARDS */
+
 #include <stdio.h>
 #if HAVE_SYS_TYPES_H
 # include <sys/types.h>
@@ -261,6 +266,9 @@
 #endif
 
 #if defined(COLLECT_DEBUG) && COLLECT_DEBUG && defined(__GNUC__) && __GNUC__
+# undef strcpy
+# undef strcat
+# undef strtok
 # pragma GCC poison strcpy strcat strtok
 #endif
 
@@ -272,6 +280,7 @@
  */
 #ifndef DONT_POISON_SPRINTF_YET
 # if defined(COLLECT_DEBUG) && COLLECT_DEBUG && defined(__GNUC__) && __GNUC__
+#  undef sprintf
 #  pragma GCC poison sprintf
 # endif
 #endif