[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=4eea186

The following commit has been merged in the master branch:
commit 4eea186240e6ebb2d74e9a4883dffc836b9c1642
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Apr 3 05:41:42 2010 +0000

    #688: Stronger check for return type of strrerror_r. (Nikolai Saoukh)
---
 config/ConfigureChecks.cmake | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/config/ConfigureChecks.cmake b/config/ConfigureChecks.cmake
index c049236..1ae230d 100644
--- a/config/ConfigureChecks.cmake
+++ b/config/ConfigureChecks.cmake
@@ -144,12 +144,10 @@ return 0;
 endif( HAVE_SYS_TIME_H )
 
 # strerror_r returns char*
-check_c_source_compiles( "#include <string.h>
-int main() {
-char * c;
-c = strerror_r(0,c,0);
-return 0;
-}" STRERROR_R_CHAR_P )
+check_cxx_source_compiles( "
+#include <cstring>
+int dfunc() { char cb[12]; return *(strerror_r(1, cb, sizeof(cb))) == '

-- 
exiv2 packaging