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

The following commit has been merged in the master branch:
commit 7a530fc49aad55cff7d0dc94e6832e75be6a0a94
Author: Robin Mills <robin at clanmills.com>
Date:   Wed Jul 23 19:11:23 2014 +0000

    Fixed MinGW compilation error in jp2image.cpp u_int32_t not defined (in stdint.h/Linux, types.h/Mac)
    This is an unexpected new defect as MinGW has previously build OK.
---
 src/types.hpp   | 13 +++++++++++++
 src/version.cpp | 10 ++--------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/types.hpp b/src/types.hpp
index c3dca54..529c976 100644
--- a/src/types.hpp
+++ b/src/types.hpp
@@ -39,6 +39,12 @@
 # include "exv_conf.h"
 #endif
 
+#if defined(__MINGW32__) || defined(__MINGW64__)
+# ifndef  __MINGW__
+#  define __MINGW__
+# endif
+#endif
+
 #include "version.hpp"
 
 // + standard includes
@@ -68,6 +74,13 @@ typedef __int64          int64_t;
 # define EXV_WIDEN(t) L ## t
 #endif
 
+#ifdef  __MINGW__
+typedef	unsigned char		u_int8_t;
+typedef	unsigned short		u_int16_t;
+typedef	unsigned int		u_int32_t;
+typedef	unsigned long long	u_int64_t;
+#endif
+
 /*!
   @brief Macro to make calls to member functions through a pointer more readable.
          See the C++ FAQ LITE, item
diff --git a/src/version.cpp b/src/version.cpp
index e820108..a24f051 100644
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -37,12 +37,6 @@ EXIV2_RCSID("@(#) $Id$")
 # include "exv_conf.h"
 #endif
 
-#if defined(__MINGW32__) || defined(__MINGW64__)
-# ifndef  __MINGW__
-#  define __MINGW__
-# endif
-#endif
-
 #if defined(__CYGWIN__) || defined(__MINGW__)
 #include <windows.h>
 #endif
@@ -240,7 +234,7 @@ EXIV2API void dumpLibraryInfo(std::ostream& os)
     struct lmap*      pl;
     void*             ph = dlopen(NULL, RTLD_NOW);
     struct something* p  = (struct something*) ph;
-    
+
     p  = p->ptr;
     pl = (struct lmap*)p->ptr;
 
@@ -267,7 +261,7 @@ EXIV2API void dumpLibraryInfo(std::ostream& os)
         for ( string_i lib = libs.begin()+1 ; lib != libs.end() ; lib++ )
             os << "library=" << *lib << endl;
     }
-    
+
 #if defined(__linux__)
     dlclose(ph);
     ph=NULL;

-- 
exiv2 packaging