[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=339bf9c

The following commit has been merged in the master branch:
commit 339bf9c0fd507d8e6927af5dcd9b9473e524d0f4
Author: Robin Mills <robin at clanmills.com>
Date:   Thu Jun 23 23:23:17 2016 +0000

    fixing mingw buildbreakers
---
 src/http.cpp      |  3 +++
 src/makernote.cpp | 22 +++++++++++++++-------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/http.cpp b/src/http.cpp
index a8c8b35..a58172f 100644
--- a/src/http.cpp
+++ b/src/http.cpp
@@ -46,6 +46,9 @@
 
 #if defined(__MINGW32__) || defined(__MINGW64__)
 #define  fopen_S(f,n,a)  f=fopen(n,a)
+#ifndef __MINGW__
+#define __MINGW__ 1
+#endif
 #endif
 
 ////////////////////////////////////////
diff --git a/src/makernote.cpp b/src/makernote.cpp
index bb64eea..e6da9c4 100644
--- a/src/makernote.cpp
+++ b/src/makernote.cpp
@@ -42,9 +42,19 @@ EXIV2_RCSID("@(#) $Id$")
 #include <string>
 #include <cstring>
 
-#if defined(_MSC_VER) || defined(__MINGW__)
-# include <windows.h>
-# include <shlobj.h>
+#if defined(__MINGW32__) || defined(__MINGW64__)
+#ifndef __MINGW__
+#define __MINGW__ 1
+#endif
+#endif
+
+#if !defined(_MSC_VER) && !defined(__MINGW__)
+#include <unistd.h>
+#include <sys/types.h>
+#include <pwd.h>
+#else
+#include <windows.h>
+#include <shlobj.h>
   /* older SDKs not have these */
 # ifndef CSIDL_MYMUSIC
 #    define CSIDL_MYMUSIC 13
@@ -68,12 +78,10 @@ EXIV2_RCSID("@(#) $Id$")
 #    define CSIDL_PROFILE 40
 # endif
 # include <process.h>
-#else
-# include <unistd.h>
-# include <sys/types.h>
-# include <pwd.h>
+
 #endif
 
+
 // *****************************************************************************
 namespace {
     // Todo: Can be generalized further - get any tag as a string/long/...

-- 
exiv2 packaging