[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=4c4955f

The following commit has been merged in the master branch:
commit 4c4955f8760e3d67e3769827f5287dc167e92a7f
Author: Robin Mills <robin at clanmills.com>
Date:   Wed Mar 3 06:37:33 2010 +0000

    adding EXIV2API to class CharsetInfo to fix the Mac build breaker introduced in revision:2032
---
 src/value.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/value.hpp b/src/value.hpp
index 52b94e6..7d55703 100644
--- a/src/value.hpp
+++ b/src/value.hpp
@@ -529,7 +529,7 @@ namespace Exiv2 {
             const char* code_;                      //!< Code of the charset
         }; // struct CharsetTable
         //! Charset information lookup functions. Implemented as a static class.
-        class CharsetInfo {
+        class EXIV2API CharsetInfo {
             //! Prevent construction: not implemented.
             CharsetInfo() {}
             //! Prevent copy-construction: not implemented.
@@ -539,7 +539,7 @@ namespace Exiv2 {
 
         public:
             //! Return the name for a charset id
-            EXV_DLLLOCAL static const char* name(CharsetId charsetId);
+            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