port forward of fixes from the stable version of rrd_cgi

[rrdtool.git] / src / rrd_not_thread_safe.c

diff --git a/src/rrd_not_thread_safe.c b/src/rrd_not_thread_safe.c
index 17ab404..8cdc00e 100644 (file)
--- a/src/rrd_not_thread_safe.c
+++ b/src/rrd_not_thread_safe.c
@@ -13,6 +13,7 @@
 #include "rrd_tool.h"
 #define MAXLEN 4096
 #define ERRBUFLEN 256
+
 static char rrd_error[MAXLEN] = "\0";
 static char rrd_liberror[ERRBUFLEN] = "\0";
 /* The global context is very useful in the transition period to even
@@ -30,6 +31,11 @@ struct rrd_context *rrd_get_context() {
     return &global_ctx;
 }
 
+/* how ugly that is!!! - make sure strerror is what it should be. It
+   might be redefined to help in keeping other modules thread safe by
+   silently turning misplaced strerror into rrd_strerror, but here
+   this turns recursive! */
+#undef strerror
 const char *rrd_strerror(int err) {
     return strerror(err);
 }