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

The following commit has been merged in the master branch:
commit f88138bc59834f60e288e8a6c2617d7af52e4da0
Author: Robin Mills <robin at clanmills.com>
Date:   Thu Apr 21 11:30:46 2016 +0000

    #1169.  Correction to r4282.  I should not have submitted the change to exv_msvc.h
---
 include/exiv2/exv_msvc.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/include/exiv2/exv_msvc.h b/include/exiv2/exv_msvc.h
index 9b96cc2..aaec995 100644
--- a/include/exiv2/exv_msvc.h
+++ b/include/exiv2/exv_msvc.h
@@ -85,7 +85,6 @@
 
 /* Define Windows unicode path support. */
 /* #undef EXV_UNICODE_PATH */
-#define EXV_UNICODE_PATH 1 
 
 
 /* Define to `const' or to empty, depending on the second argument of `iconv'. */
@@ -117,7 +116,7 @@
 #define EXV_HAVE_REALLOC 1
 
 /* Define to 1 if stdbool.h conforms to C99. */
-#define EXV_HAVE_STDBOOL_H 1
+/* #undef EXV_HAVE_STDBOOL_H */
 
 /* Define to 1 if you have the <stdint.h> header file. */
 /* #undef EXV_HAVE_STDINT_H */
@@ -165,7 +164,7 @@
 /* #undef EXV_HAVE_UNISTD_H */
 
 /* Define to 1 if you have the `vprintf' function. */
-/* #undef EXV_HAVE_VPRINTF */
+#define EXV_HAVE_VPRINTF 1
 
 /* Define to 1 if you have the <wchar.h> header file. */
 /* #undef EXV_HAVE_WCHAR_H */

-- 
exiv2 packaging