[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=90147a3

The following commit has been merged in the master branch:
commit 90147a34399bac7d4c790936ae1b28c2500b3fc2
Author: Robin Mills <robin at clanmills.com>
Date:   Mon Mar 1 05:10:07 2010 +0000

    MSVC fixes to
    1) remove use of gmtime_r
    2) export static DLL method const char* CommentValue::name(CharsetId)
    See discussion #419 in the Forum.  http://dev.exiv2.org/boards/3/topics/show/419
---
 src/actions.cpp | 5 ++++-
 src/value.hpp   | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/actions.cpp b/src/actions.cpp
index 8a95c21..de8e94c 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -1850,8 +1850,11 @@ namespace {
 
         // Conversions to set remaining fields of the tm structure
         time_t time = timegm(tm);
+#ifdef EXV_HAVE_GMTIME_R
         if (time == (time_t)-1 || gmtime_r(&time, tm) == 0) return 11;
-
+#else
+        if (time == (time_t)-1 || std::gmtime(&time)  == 0) return 11;
+#endif
         return 0;
     } // str2Tm
 
diff --git a/src/value.hpp b/src/value.hpp
index 4a7321e..52b94e6 100644
--- a/src/value.hpp
+++ b/src/value.hpp
@@ -539,7 +539,7 @@ namespace Exiv2 {
 
         public:
             //! Return the name for a charset id
-            static const char* name(CharsetId charsetId);
+            EXV_DLLLOCAL static const char* name(CharsetId charsetId);
             //! Return the code for a charset id
             static const char* code(CharsetId charsetId);
             //! Return the charset id for a name

-- 
exiv2 packaging