[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=8f86aab

The following commit has been merged in the master branch:
commit 8f86aab390fa954f4fdd0f0ab6f970a1c3aa32dc
Author: Robin Mills <robin at clanmills.com>
Date:   Wed Apr 17 06:33:44 2013 +0000

    Update to r3018 to eliminate compiler warnings from GCC on Mac.
---
 src/rcsid_int.hpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/rcsid_int.hpp b/src/rcsid_int.hpp
index efd69a1..030e675 100644
--- a/src/rcsid_int.hpp
+++ b/src/rcsid_int.hpp
@@ -53,15 +53,22 @@
 
  */
 
-#ifndef  __clang__
+#if defined(__clang__)
+#define EXIV2_RCSID(id)
+
+#elif defined(OS_SOLARIS)
 #define EXIV2_RCSID(id) \
-//    namespace { \
     { \
         inline const char* getRcsId(const char*) { return id ; } \
         const char* rcsId = getRcsId(rcsId); \
     }
+
 #else
-#define EXIV2_RCSID(id)
+#define EXIV2_RCSID(id) \
+    namespace { \
+        inline const char* getRcsId(const char*) { return id ; } \
+        const char* rcsId = getRcsId(rcsId); \
+    }
 #endif
 
 #endif // #if !defined (EXIV2_RCSID)

-- 
exiv2 packaging