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

The following commit has been merged in the master branch:
commit d09658a5eb2ce69cb4ec87c497bab76a30ef53c9
Author: Robin Mills <robin at clanmills.com>
Date:   Mon Sep 1 18:19:04 2014 +0000

    Issue: 984.  Correction to r3345.  I submitted Axel's patched file in error.
    This version deals with older MSVC (such as 2005) which do not provide REPLACEFILE_IGNORE_MERGE_ERRORS.
---
 src/basicio.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/basicio.cpp b/src/basicio.cpp
index 4f46cd9..c9015cd 100644
--- a/src/basicio.cpp
+++ b/src/basicio.cpp
@@ -710,7 +710,7 @@ namespace Exiv2 {
             // MSVCRT rename that does not overwrite existing files
 #ifdef EXV_UNICODE_PATH
             if (p_->wpMode_ == Impl::wpUnicode) {
-#if defined WIN32 && !defined __CYGWIN__
+#if defined(WIN32) && defined(REPLACEFILE_IGNORE_MERGE_ERRORS)
                 // Windows implementation that deals with the fact that ::rename fails
                 // if the target filename still exists, which regularly happens when
                 // that file has been opened with FILE_SHARE_DELETE by another process,
@@ -748,7 +748,7 @@ namespace Exiv2 {
             else
 #endif // EXV_UNICODE_PATH
             {
-#if defined WIN32 && !defined __CYGWIN__
+#if defined(WIN32) && defined(REPLACEFILE_IGNORE_MERGE_ERRORS)
                 // Windows implementation that deals with the fact that ::rename fails
                 // if the target filename still exists, which regularly happens when
                 // that file has been opened with FILE_SHARE_DELETE by another process,

-- 
exiv2 packaging