[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=1ac5ccc

The following commit has been merged in the master branch:
commit 1ac5ccc2f98ec29e864cda414ecb45f76979e313
Author: Robin Mills <robin at clanmills.com>
Date:   Tue Jun 14 11:01:33 2016 +0000

    Fixing warning from contrib/buildserver/test_daily.sh concerning redefinition of EXV_SEPARATOR_STR|CHR when testing msvc builds
---
 config/config.h.cmake    | 6 +++---
 include/exiv2/exv_msvc.h | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/config.h.cmake b/config/config.h.cmake
index edeaee8..22a302c 100644
--- a/config/config.h.cmake
+++ b/config/config.h.cmake
@@ -1,10 +1,10 @@
 /**/
-/* config.h.  Generated by cmake from config.h.cmake.  */
+/* Generated by cmake from config.h.cmake.  */
 
-#ifdef  _MSC_VER
 #ifndef _EXV_MSVC_H_
 #define _EXV_MSVC_H_
 
+#ifdef  _MSC_VER
 #define _MSC_VER_2015 1900
 #define _MSC_VER_2013 1800
 #define _MSC_VER_2012 1700
@@ -351,4 +351,4 @@ typedef int pid_t;
 #include <ios>
 #include <fstream>
 #endif
-#endif
\ No newline at end of file
+#endif
diff --git a/include/exiv2/exv_msvc.h b/include/exiv2/exv_msvc.h
index b95f7b4..2ce5e1c 100644
--- a/include/exiv2/exv_msvc.h
+++ b/include/exiv2/exv_msvc.h
@@ -1,10 +1,10 @@
 /**/
-/* config.h.  Generated by cmake from config.h.cmake.  */
+/* exv_msvc.h */
 
-#ifdef  _MSC_VER
 #ifndef _EXV_MSVC_H_
 #define _EXV_MSVC_H_
 
+#ifdef  _MSC_VER
 #define _MSC_VER_2015 1900
 #define _MSC_VER_2013 1800
 #define _MSC_VER_2012 1700

-- 
exiv2 packaging