[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=66dc592

The following commit has been merged in the master branch:
commit 66dc59231c3d7eab49731c4631a965748834ff88
Author: Robin Mills <robin at clanmills.com>
Date:   Sun Nov 11 20:47:07 2012 +0000

    Better compiler detection code for exiv2 -v -V
---
 src/version.cpp | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/version.cpp b/src/version.cpp
index 5dc4b7d..65a12c0 100644
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -51,7 +51,7 @@ namespace Exiv2 {
     int versionNumber()
     {
         return EXIV2_MAKE_VERSION(EXIV2_MAJOR_VERSION, EXIV2_MINOR_VERSION, EXIV2_PATCH_VERSION);
-    }
+    } 
 
     std::string versionNumberHexString()
     {
@@ -88,8 +88,6 @@ namespace Exiv2 {
 # include <psapi.h>
 
 // tell MSVC to link psapi.
-// I'm going to change this to use LoadLibrary("psapi")/FindProcAddress
-// and the code with work on Cygwin
 #ifdef	_MSC_VER
 #pragma comment( lib, "psapi" )
 #endif
@@ -137,10 +135,16 @@ EXIV2API void dumpLibraryInfo(std::ostream& os)
 	int dll=0;
 #endif
 
-#ifdef	_MSC_VER
-	sprintf(szBuilder,"MSVC=%d,DEBUG=%d,DLL=%d,Bits=%d:",((_MSC_VER-600)/100),debug,dll,bits);
+#if   defined(_MSC_VER)
+	  sprintf(szBuilder,"MSVC=%d,DEBUG=%d,DLL=%d,Bits=%d:",((_MSC_VER-600)/100),debug,dll,bits);
+#elif defined(__clang__)
+	  sprintf(szBuilder,"Clang=%s,DEBUG=%d,DLL=%d,Bits=%d:",__clang_version__,debug,dll,bits);
+#elif defined(__GNUG__)
+	  sprintf(szBuilder,"G++=%s,DEBUG=%d,DLL=%d,Bits=%d: ",__VERSION__,debug,dll,bits);
+#elif defined(__GNUC__)
+	  sprintf(szBuilder,"GCC=%s,DEBUG=%d,DLL=%d,Bits=%d: ",__VERSION__,debug,dll,bits);
 #else
-	sprintf(szBuilder,"GCC=%s,DEBUG=%d,DLL=%d,Bits=%d: ",__VERSION__,debug,dll,bits);
+	  sprintf(szBuilder,"???=%s,DEBUG=%d,DLL=%d,Bits=%d: ",__VERSION__,debug,dll,bits);
 #endif
 	path[0]=0;
 

-- 
exiv2 packaging