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

The following commit has been merged in the master branch:
commit 4a0f652a7f9b59248173b31b28d5e062b5b42d9b
Author: Robin Mills <robin at clanmills.com>
Date:   Fri Nov 27 20:15:17 2015 +0000

    #1041.  Correction to r4056
---
 xmpsdk/include/MD5.h | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/xmpsdk/include/MD5.h b/xmpsdk/include/MD5.h
index 00a5e94..994d02f 100644
--- a/xmpsdk/include/MD5.h
+++ b/xmpsdk/include/MD5.h
@@ -24,9 +24,18 @@
  */
 
 #include <sys/types.h>
+
+#ifdef _MSC_VER
+# if _MSC_VER < 1600
+#  ifdef  EXV_HAVE_STDINT_H
+#   undef EXV_HAVE_STDINT_H
+#  endif
+# endif
+
 #ifdef EXV_HAVE_STDINT_H
 # include <stdint.h>
 #endif
+#endif
 
 /* MSVC doesn't provide C99 types, but it has MS specific variants */
 #ifdef _MSC_VER

-- 
exiv2 packaging