projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
prep for 1.2.2 release
[rrdtool.git]
/
src
/
rrd_thread_safe.c
diff --git
a/src/rrd_thread_safe.c
b/src/rrd_thread_safe.c
index
223b586
..
e2778ff
100644
(file)
--- 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.2 Copyright by Tobi Oetiker, 1997-2005
* This file: Copyright 2003 Peter Stamfest <peter@stamfest.at>
* & Tobias Oetiker
* Distributed under the GPL
* 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 <pthread.h>
#include <string.h>
-#include <error.h>
+/* #include <error.h> */
#include "rrd.h"
#include "rrd_tool.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
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;
const char *rrd_strerror(int err) {
static pthread_mutex_t mtx = PTHREAD_MUTEX_INITIALIZER;
struct rrd_context *ctx;