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

The following commit has been merged in the master branch:
commit f44f706478aa604463c1126e01a226a0677c4046
Author: Robin Mills <robin at clanmills.com>
Date:   Wed Sep 7 17:08:27 2016 +0000

    MinGW changes following discussion about building with Qt5.6/MinGW 4.9.2 http://dev.exiv2.org/boards/3/topics/2705
---
 include/exiv2/config.h | 9 ++++++---
 src/basicio.cpp        | 3 +--
 src/http.cpp           | 7 ++-----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/include/exiv2/config.h b/include/exiv2/config.h
index 26eb483..eb045fe 100644
--- a/include/exiv2/config.h
+++ b/include/exiv2/config.h
@@ -155,11 +155,14 @@ typedef int pid_t;
 #endif
 
 #if defined(__MINGW32__) || defined(__MINGW64__)
-# ifndef __MING__
-#  define __MING__ 1
+# ifndef  __MING__
+#  define __MING__  1
+# endif
+# ifndef  __MINGW__
+#  define __MINGW__ 1
 # endif
 // Don't know why MinGW refuses to link libregex
-# ifdef EXV_HAVE_REGEX
+# ifdef  EXV_HAVE_REGEX
 #  undef EXV_HAVE_REGEX
 # endif
 #endif
diff --git a/src/basicio.cpp b/src/basicio.cpp
index 75d7510..06371e9 100644
--- a/src/basicio.cpp
+++ b/src/basicio.cpp
@@ -71,10 +71,9 @@ EXIV2_RCSID("@(#) $Id$")
 # include <sys/xattr.h>
 #endif
 
-#if defined WIN32 && !defined __CYGWIN__
+#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/http.cpp b/src/http.cpp
index a58172f..5c824a2 100644
--- a/src/http.cpp
+++ b/src/http.cpp
@@ -44,16 +44,13 @@
 #define SLEEP       1000
 #define SNOOZE         0
 
-#if defined(__MINGW32__) || defined(__MINGW64__)
+#ifdef  __MINGW__
 #define  fopen_S(f,n,a)  f=fopen(n,a)
-#ifndef __MINGW__
-#define __MINGW__ 1
-#endif
 #endif
 
 ////////////////////////////////////////
 // platform specific code
-#if defined(WIN32) || defined(_MSC_VER)
+#if defined(WIN32) || defined(_MSC_VER) || defined(__MINGW__)
 #include <string.h>
 #include <windows.h>
 #include <io.h>

-- 
exiv2 packaging