[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=5c125a9

The following commit has been merged in the master branch:
commit 5c125a9f19cde3c270dd48f17283b0b908799d95
Author: Robin Mills <robin at clanmills.com>
Date:   Sat Jun 4 17:08:09 2016 +0000

    #1187 and #1041.  Fixing CMake/MSVC 2013/15 build breakers
---
 config/config.h.cmake    | 7 ++++++-
 include/exiv2/exv_msvc.h | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/config/config.h.cmake b/config/config.h.cmake
index 78b6f60..edeaee8 100644
--- a/config/config.h.cmake
+++ b/config/config.h.cmake
@@ -326,7 +326,12 @@ typedef int pid_t;
 // Constants required by Microsoft SDKs to define SHGetFolderPathA and others
 #ifdef  _MSC_VER
 # ifndef _WIN32_WINNT
-#  define _WIN32_WINNT 0x0501
+// Visual Studio 2012 and earlier
+#  if _MSC_VER < 1800
+#   define _WIN32_WINNT 0x0501
+#  else
+#   define _WIN32_WINNT 0x0600
+#  endif
 # endif
 # include <windows.h>
 # include <shlobj.h>
diff --git a/include/exiv2/exv_msvc.h b/include/exiv2/exv_msvc.h
index 07895d4..b95f7b4 100644
--- a/include/exiv2/exv_msvc.h
+++ b/include/exiv2/exv_msvc.h
@@ -326,7 +326,12 @@ typedef int pid_t;
 // Constants required by Microsoft SDKs to define SHGetFolderPathA and others
 #ifdef  _MSC_VER
 # ifndef _WIN32_WINNT
-#  define _WIN32_WINNT 0x0400
+// Visual Studio 2012 and earlier
+#  if _MSC_VER < 1800
+#   define _WIN32_WINNT 0x0501
+#  else
+#   define _WIN32_WINNT 0x0600
+#  endif
 # endif
 # include <windows.h>
 # include <shlobj.h>

-- 
exiv2 packaging