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

The following commit has been merged in the master branch:
commit cc061782d1c2ac6bf27dace680b070086596d939
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Mar 24 13:00:00 2012 +0000

    #812: Tweak to make the code compile with MSYS/MinGW.
---
 src/basicio.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/basicio.cpp b/src/basicio.cpp
index 04c7d94..2d336ba 100644
--- a/src/basicio.cpp
+++ b/src/basicio.cpp
@@ -61,13 +61,11 @@ EXIV2_RCSID("@(#) $Id$")
 # include <unistd.h>                    // for getpid, stat
 #endif
 
-// MSVC doesn't provide mode_t, nlink_t
-#ifdef _MSC_VER
+#if defined WIN32 && !defined __CYGWIN__
+// Windows doesn't provide mode_t, nlink_t
 typedef unsigned short mode_t;
 typedef short nlink_t;
-#endif
 
-#if defined WIN32 && !defined __CYGWIN__
 # include <windows.h>
 # include <io.h>
 #endif

-- 
exiv2 packaging