[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=b2a9b6c

The following commit has been merged in the master branch:
commit b2a9b6cb9eafa620f08317e5f05a0eb417aadcc2
Author: Robin Mills <robin at clanmills.com>
Date:   Sun May 6 05:44:01 2012 +0000

    Bug #824: undeclared identifier EXV_ICONV_CONST
---
 msvc/include/exv_msvc.h   | 4 ++++
 msvc64/include/exv_msvc.h | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/msvc/include/exv_msvc.h b/msvc/include/exv_msvc.h
index c5036c2..e778820 100644
--- a/msvc/include/exv_msvc.h
+++ b/msvc/include/exv_msvc.h
@@ -53,6 +53,10 @@ typedef int pid_t;
 /* Define to 1 if you have the `iconv' function. */
 # undef EXV_HAVE_ICONV
 
+#ifdef  EXV_HAVE_ICONV
+#define EXV_ICONV_CONST const
+#endif
+
 /* Define as 1 if you have the `zlib' library. (0 to omit zlib) [png support] */
 #define HAVE_LIBZ 1
 
diff --git a/msvc64/include/exv_msvc.h b/msvc64/include/exv_msvc.h
index 4e315e2..9d22c5d 100644
--- a/msvc64/include/exv_msvc.h
+++ b/msvc64/include/exv_msvc.h
@@ -53,6 +53,10 @@ typedef int pid_t;
 /* Define to 1 if you have the `iconv' function. */
 # undef EXV_HAVE_ICONV
 
+#ifdef  EXV_HAVE_ICONV
+#define EXV_ICONV_CONST const
+#endif
+
 /* Define as 1 if you have the `zlib' library. (0 to omit zlib) [png support] */
 #define HAVE_LIBZ 1
 

-- 
exiv2 packaging