[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=46a6f31

The following commit has been merged in the master branch:
commit 46a6f318b2c9eff505686e64b9bfc811f40af472
Author: HumanDynamo <caulier.gilles at gmail.com>
Date:   Wed Apr 14 08:09:11 2010 +0000

    apply patch from BUG #688
---
 src/futils.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/futils.cpp b/src/futils.cpp
index 46127e0..9486a07 100644
--- a/src/futils.cpp
+++ b/src/futils.cpp
@@ -93,7 +93,7 @@ namespace Exiv2 {
 #ifdef EXV_HAVE_STRERROR_R
         const size_t n = 1024;
 // _GNU_SOURCE: See Debian bug #485135
-# if defined EXV_STRERROR_R_CHAR_P || defined _GNU_SOURCE
+# if defined EXV_STRERROR_R_CHAR_P && defined _GNU_SOURCE
         char *buf = 0;
         char buf2[n];
         std::memset(buf2, 0x0, n);

-- 
exiv2 packaging