Updated changelog to mention the merged NMU.

[pkg-rrdtool.git] / src / rrd_thread_safe.c

diff --git a/src/rrd_thread_safe.c b/src/rrd_thread_safe.c
index 993e3e7b038e7dbfa92af921dfb1f608c6806eb9..133a7ea3548e2ce0b8a499fbe856cd85f84fd5b5 100644 (file)
--- a/src/rrd_thread_safe.c
+++ b/src/rrd_thread_safe.c
@@ -1,12 +1,12 @@
 /*****************************************************************************
- * RRDtool 1.3.2  Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.4.7  Copyright by Tobi Oetiker, 1997-2012
  * This file:     Copyright 2003 Peter Stamfest <peter@stamfest.at> 
  *                             & Tobias Oetiker
  * Distributed under the GPL
  *****************************************************************************
  * rrd_thread_safe.c   Contains routines used when thread safety is required
  *****************************************************************************
- * $Id: rrd_thread_safe.c 1752 2009-03-06 05:39:37Z oetiker $
+ * $Id: rrd_thread_safe.c 2267 2012-01-24 10:08:48Z oetiker $
  *************************************************************************** */
 
 #include <pthread.h>
@@ -66,7 +66,7 @@ const char *rrd_strerror(
     /* Even though POSIX/XSI requires "strerror_r" to return an "int", some
      * systems (e.g. the GNU libc) return a "char *" _and_ ignore the second
      * argument ... -tokkee */
-#if STRERROR_R_CHAR_P
+#ifdef STRERROR_R_CHAR_P
     ret = strerror_r(err, ctx->lib_errstr, sizeof(ctx->lib_errstr));
     if ((! ret) || (*ret == '\0')) {
         if (*ctx->lib_errstr != '\0')