X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Frrd_thread_safe.c;h=d2033198723ac6fde15c6720af3025b4b1a78f8e;hb=d1fe50003e73e2772e9026f29c0ba658143dec7a;hp=223b586735695501819b4af39927c5a5f33471f3;hpb=298b318acaf1147474ab9e97cac37c3608660efd;p=rrdtool.git

diff --git a/src/rrd_thread_safe.c b/src/rrd_thread_safe.c
index 223b586..d203319 100644
--- a/src/rrd_thread_safe.c
+++ b/src/rrd_thread_safe.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.1.x  Copyright Tobias Oetiker, 1997 - 2002
+ * RRDtool 1.2.0  Copyright by Tobi Oetiker, 1997-2005
  * This file:     Copyright 2003 Peter Stamfest <peter@stamfest.at> 
  *                             & Tobias Oetiker
  * Distributed under the GPL
@@ -11,7 +11,7 @@
 
 #include <pthread.h>
 #include <string.h>
-#include <error.h>
+/* #include <error.h> */
 #include "rrd.h"
 #include "rrd_tool.h"
 
@@ -54,6 +54,7 @@ const char *rrd_strerror(int err) {
     return strerror_r(err, ctx->lib_errstr, ctx->errlen);
 }
 #else
+#undef strerror
 const char *rrd_strerror(int err) {
     static pthread_mutex_t mtx = PTHREAD_MUTEX_INITIALIZER;
     struct rrd_context *ctx;