[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=4f135ed

The following commit has been merged in the master branch:
commit 4f135ed1d3a7dde4e99b0532c58404ffdc031561
Author: Robin Mills <robin at clanmills.com>
Date:   Sun Jun 12 12:17:59 2016 +0000

    #1034 (and #1187).  Fixed buildbreaker in MinGW/configure build.
---
 src/makernote.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/makernote.cpp b/src/makernote.cpp
index 0f45e97..bb64eea 100644
--- a/src/makernote.cpp
+++ b/src/makernote.cpp
@@ -42,7 +42,7 @@ EXIV2_RCSID("@(#) $Id$")
 #include <string>
 #include <cstring>
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__MINGW__)
 # include <windows.h>
 # include <shlobj.h>
   /* older SDKs not have these */
@@ -92,7 +92,7 @@ namespace Exiv2 {
 		{
     		std::string homedir;
     		std::string inifile;
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__MINGW__)
 			char path[MAX_PATH];
 			if (SUCCEEDED(SHGetFolderPathA(NULL, CSIDL_PROFILE, NULL, 0, path))) {
   				homedir = std::string(path);

-- 
exiv2 packaging