[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=559ace3

The following commit has been merged in the master branch:
commit 559ace375b2e7903f30fba4073f3a218489f4f06
Author: Robin Mills <robin at clanmills.com>
Date:   Sun Apr 23 19:29:19 2017 +0000

    #1291 Reverting change in r4763 relating to windows.h as they break the Cygwin build.  Retain changes in exiv2/exiv2.hpp and exv_msvc.h
---
 include/exiv2/rwlock.hpp | 6 ++----
 src/basicio.cpp          | 1 +
 src/convert.cpp          | 4 ++++
 src/exiv2app.hpp         | 5 ++++-
 src/http.cpp             | 1 +
 src/jpgimage.cpp         | 4 +++-
 src/makernote.cpp        | 1 +
 src/types.cpp            | 3 +++
 src/version.cpp          | 1 +
 9 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/include/exiv2/rwlock.hpp b/include/exiv2/rwlock.hpp
index 68b8830..04afe45 100644
--- a/include/exiv2/rwlock.hpp
+++ b/include/exiv2/rwlock.hpp
@@ -22,11 +22,9 @@
 #ifndef RW_LOCK_HPP
 #define RW_LOCK_HPP
 
-#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW__)
+#ifdef _MSC_VER
 #include <windows.h>
-#endif
-
-#ifndef  _MSC_VER
+#else
 #include <pthread.h>
 #endif
 
diff --git a/src/basicio.cpp b/src/basicio.cpp
index 63d5460..95589cd 100644
--- a/src/basicio.cpp
+++ b/src/basicio.cpp
@@ -72,6 +72,7 @@ EXIV2_RCSID("@(#) $Id$")
 #if defined(__MINGW__) || (defined(WIN32) && !defined(__CYGWIN))
 // Windows doesn't provide nlink_t
 typedef short nlink_t;
+# include <windows.h>
 # include <io.h>
 #endif
 
diff --git a/src/convert.cpp b/src/convert.cpp
index 025228c..26a5fd8 100644
--- a/src/convert.cpp
+++ b/src/convert.cpp
@@ -51,6 +51,10 @@ EXIV2_RCSID("@(#) $Id$")
 #endif
 #include <cstring>
 
+#if defined WIN32 && !defined __CYGWIN__
+# include <windows.h>
+#endif
+
 #ifdef EXV_HAVE_ICONV
 # include <iconv.h>
 # include <errno.h>
diff --git a/src/exiv2app.hpp b/src/exiv2app.hpp
index 3fcf4e8..affbcb8 100644
--- a/src/exiv2app.hpp
+++ b/src/exiv2app.hpp
@@ -34,6 +34,7 @@
 #include <exiv2/exiv2.hpp>
 
 #include "utils.hpp"
+#include "types.hpp"
 
 // + standard includes
 #include <string>
@@ -54,7 +55,9 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#if !defined(__CYGWIN__) && !defined(__MINGW__)
+#if defined(__CYGWIN__) || defined(__MINGW__)
+#include <windows.h>
+#else
 #include <sys/select.h>
 #endif
 #endif
diff --git a/src/http.cpp b/src/http.cpp
index 43c98a2..86b7ebb 100644
--- a/src/http.cpp
+++ b/src/http.cpp
@@ -57,6 +57,7 @@
 // platform specific code
 #if defined(WIN32) || defined(_MSC_VER) || defined(__MINGW__)
 #include <string.h>
+#include <windows.h>
 #include <io.h>
 #ifndef  __MINGW__
 #define  snprintf sprintf_s
diff --git a/src/jpgimage.cpp b/src/jpgimage.cpp
index ca61c34..9afcb58 100644
--- a/src/jpgimage.cpp
+++ b/src/jpgimage.cpp
@@ -35,7 +35,9 @@ EXIV2_RCSID("@(#) $Id$")
 #include "error.hpp"
 #include "futils.hpp"
 
-#ifndef WIN32
+#ifdef WIN32
+#include <windows.h>
+#else
 #define BYTE   char
 #define USHORT uint16_t
 #define ULONG  uint32_t
diff --git a/src/makernote.cpp b/src/makernote.cpp
index 316d8d1..4816f88 100644
--- a/src/makernote.cpp
+++ b/src/makernote.cpp
@@ -53,6 +53,7 @@ EXIV2_RCSID("@(#) $Id$")
 #include <sys/types.h>
 #include <pwd.h>
 #else
+#include <windows.h>
 #include <shlobj.h>
   /* older SDKs not have these */
 # ifndef CSIDL_MYMUSIC
diff --git a/src/types.cpp b/src/types.cpp
index 8585255..df50970 100644
--- a/src/types.cpp
+++ b/src/types.cpp
@@ -35,6 +35,9 @@ EXIV2_RCSID("@(#) $Id$")
 #include "i18n.h"                               // for _exvGettext
 
 // + standard includes
+#ifdef EXV_UNICODE_PATH
+# include <windows.h> // for MultiByteToWideChar etc
+#endif
 #include <string>
 #include <iostream>
 #include <iomanip>
diff --git a/src/version.cpp b/src/version.cpp
index b4f39e1..45e218f 100644
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -146,6 +146,7 @@ namespace Exiv2 {
 
 // platform specific support for dumpLibraryInfo
 #if defined(WIN32)
+# include <windows.h>
 # include <psapi.h>
 
 // tell MSVC to link psapi.

-- 
exiv2 packaging