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

The following commit has been merged in the master branch:
commit fb24a572c6f07d88ca971fbf303e898f5aaa3251
Author: Robin Mills <robin at clanmills.com>
Date:   Sun Apr 23 16:28:01 2017 +0000

    #1291  Thank you to T Modes for reporting this and providing this patch.
---
 include/exiv2/config.h   | 1 -
 include/exiv2/rwlock.hpp | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/exiv2/config.h b/include/exiv2/config.h
index 844f3cc..b73f8d8 100644
--- a/include/exiv2/config.h
+++ b/include/exiv2/config.h
@@ -6,7 +6,6 @@
 
 ///// Start of Visual Studio Support /////
 #ifdef  _MSC_VER
-#include <windows.h>
 
 #define _MSC_VER_2015 1900
 #define _MSC_VER_2013 1800
diff --git a/include/exiv2/rwlock.hpp b/include/exiv2/rwlock.hpp
index caafb63..04afe45 100644
--- a/include/exiv2/rwlock.hpp
+++ b/include/exiv2/rwlock.hpp
@@ -22,7 +22,9 @@
 #ifndef RW_LOCK_HPP
 #define RW_LOCK_HPP
 
-#ifndef _MSC_VER
+#ifdef _MSC_VER
+#include <windows.h>
+#else
 #include <pthread.h>
 #endif
 

-- 
exiv2 packaging