[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=cbc9a5b

The following commit has been merged in the master branch:
commit cbc9a5bbaa044ede7d59de32e973d1d5bd99c872
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Wed Jan 18 02:48:52 2006 +0000

    Fixed to use GNU version of strerror_r where needed
---
 src/futils.cpp | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/futils.cpp b/src/futils.cpp
index f8ec352..d19c913 100644
--- a/src/futils.cpp
+++ b/src/futils.cpp
@@ -50,8 +50,16 @@ EXIV2_RCSID("@(#) $Id$");
 #endif
 
 #include <cerrno>
-#include <string.h>
 #include <sstream>
+#include <cstring>
+
+#if defined EXV_HAVE_STRERROR_R && !defined EXV_HAVE_DECL_STRERROR_R
+# ifdef EXV_STRERROR_R_CHAR_P
+extern char *strerror_r(int errnum, char *buf, size_t n);
+# else
+extern int strerror_r(int errnum, char *buf, size_t n);
+# endif
+#endif
 
 namespace Exiv2 {
 
@@ -73,9 +81,16 @@ namespace Exiv2 {
         std::ostringstream os;
 #ifdef EXV_HAVE_STRERROR_R
         const size_t n = 1024;
+# ifdef EXV_STRERROR_R_CHAR_P
+        char *buf = 0;
+        char buf2[n];
+        memset(buf2, 0x0, n);
+        buf = strerror_r(error, buf2, n);
+# else
         char buf[n];
         memset(buf, 0x0, n);
         strerror_r(error, buf, n);
+# endif
         os << buf;
 #else
         os << std::strerror(error);

-- 
exiv2 packaging