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

The following commit has been merged in the master branch:
commit f71d15442ae510e97544a9e41d92aa6f6a9d5dce
Author: Robin Mills <robin at clanmills.com>
Date:   Tue Oct 14 14:24:26 2014 +0000

    Better platform detection in version.cpp for MinGW
---
 src/version.cpp | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/version.cpp b/src/version.cpp
index a24f051..c51b00f 100644
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -29,6 +29,12 @@
 #include "rcsid_int.hpp"
 EXIV2_RCSID("@(#) $Id$")
 
+#if defined(__MINGW32__) || defined(__MINGW64__)
+#ifndef __MINGW__
+#define __MINGW__
+#endif
+#endif
+
 // *****************************************************************************
 // included header files
 #ifdef _MSC_VER
@@ -124,10 +130,6 @@ typedef string_v::iterator  string_i;
     void*    not_needed1;    /* Pointer to the dynamic section of the shared object */
     struct lmap *next, *prev;/* chain of loaded objects */
   };
-#elif defined(__MINGW32__) || defined(__MINGW64__)
-#ifndef __MINGW__
-#define __MINGW__
-#endif
 #endif
 
 EXIV2API void dumpLibraryInfo(std::ostream& os)
@@ -191,8 +193,10 @@ EXIV2API void dumpLibraryInfo(std::ostream& os)
       "windows";
 #elif defined(__APPLE__)
       "apple";
-#elif defined(__MINGW__)
-      "mingw";
+#elif defined(__MINGW64__)
+      "mingw64";
+#elif defined(__MINGW32__)
+      "mingw32";
 #elif defined(__linux__)
       "linux";
 #else

-- 
exiv2 packaging