[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=0c57b55

The following commit has been merged in the master branch:
commit 0c57b55035f4802bbd9d42a9ed70e5f0ec46e446
Author: Robin Mills <robin at clanmills.com>
Date:   Thu Nov 3 12:26:28 2016 +0000

    #1230 Fix msvc build breaker when building using configure.bat -W (with WebReady)
---
 include/exiv2/config.h   | 2 ++
 include/exiv2/rwlock.hpp | 2 +-
 src/ssh.cpp              | 4 +++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/include/exiv2/config.h b/include/exiv2/config.h
index a0c81bd..7dc3357 100644
--- a/include/exiv2/config.h
+++ b/include/exiv2/config.h
@@ -6,6 +6,8 @@
 
 ///// Start of Visual Studio Support /////
 #ifdef  _MSC_VER
+#include <winsock2.h>
+
 #define _MSC_VER_2015 1900
 #define _MSC_VER_2013 1800
 #define _MSC_VER_2012 1700
diff --git a/include/exiv2/rwlock.hpp b/include/exiv2/rwlock.hpp
index 16b55ca..c67c818 100644
--- a/include/exiv2/rwlock.hpp
+++ b/include/exiv2/rwlock.hpp
@@ -117,7 +117,7 @@ namespace Exiv2 {
 
             bool tryenter()
             {
-#ifdef  MSDEV_2003
+#if defined(MSDEV_2003) || defined(MSDEV_2005)
                 EnterCriticalSection(&lock_);
                 return true;
 #else
diff --git a/src/ssh.cpp b/src/ssh.cpp
index 0ee2112..44658ec 100644
--- a/src/ssh.cpp
+++ b/src/ssh.cpp
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA.
  */
 /*
-  File:      rw2image.cpp
+  File:      ssh.cpp
   Version:   $Rev: 3201 $
   Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
   History:   06-Jan-09, ahu: created
@@ -29,6 +29,8 @@
 #include "rcsid_int.hpp"
 EXIV2_RCSID("@(#) $Id: rw2image.cpp 3201 2013-12-01 12:13:42Z ahuggel $")
 
+// included header files
+#include "config.h"
 #include "ssh.hpp"
 #if EXV_USE_SSH == 1
 // class member definitions

-- 
exiv2 packaging