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

The following commit has been merged in the master branch:
commit bf473ae718111dc6bce376c8d8146825058414f6
Author: Robin Mills <robin at clanmills.com>
Date:   Wed Apr 26 14:09:58 2017 +0000

    #1292  Dimitri: Thank You for reporting this and providing the patch.
---
 include/exiv2/rwlock.hpp | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/include/exiv2/rwlock.hpp b/include/exiv2/rwlock.hpp
index 04afe45..35e49da 100644
--- a/include/exiv2/rwlock.hpp
+++ b/include/exiv2/rwlock.hpp
@@ -30,8 +30,18 @@
 
 namespace Exiv2 {
 #ifdef _MSC_VER
-// Visual Studio 2013 and later use SRWLOCK
-#if _MSC_VER >= 1800
+/*
+Visual Studio 2013 and later use SRWLOCK, however don't use Vista/7+ features
+when targeting XP.
+
+_USING_V110_SDK71_ is defined when Platform Toolset is set to target XP (and
+thus uses Windows 7.1 SDK).
+
+_ATL_XP_TARGETING can be used if you want to target XP but also want to use
+a newer SDK, such as 8.
+*/
+#if _MSC_VER >= 1800 \
+    && !(defined(_USING_V110_SDK71_) || defined(_ATL_XP_TARGETING))
         /*!
          @brief Class to provide a Read-Write Lock
         */
@@ -85,7 +95,7 @@ namespace Exiv2 {
         /*!
          @brief Class to provide a Read-Write Lock
         */
-        // Visual Studio 2005,8,10,12 use CRITICAL_SECTION
+        // Visual Studio 2005,8,10,12 and XP targets use CRITICAL_SECTION
         class RWLock
         {
         public:

-- 
exiv2 packaging