openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File gcc43.diff of Package exiv2 (Revision 8932e48c8ee82eebb3e9d1ea7ad1cbf6)

Currently displaying revision 8932e48c8ee82eebb3e9d1ea7ad1cbf6 , Show latest

Index: xmpsdk/src/XMPCore_Impl.hpp
===================================================================
--- xmpsdk/src/XMPCore_Impl.hpp.orig
+++ xmpsdk/src/XMPCore_Impl.hpp
@@ -19,6 +19,7 @@
 
 #include "client-glue/WXMPMeta.hpp"
 
+#include <string.h>
 #include <vector>
 #include <string>
 #include <map>
@@ -89,8 +90,8 @@ extern WXMP_Result		void_wResult;
 
 #define kHexDigits "0123456789ABCDEF"
 
-#define XMP_LitMatch(s,l)		(std::strcmp((s),(l)) == 0)
-#define XMP_LitNMatch(s,l,n)	(std::strncmp((s),(l),(n)) == 0)
+#define XMP_LitMatch(s,l)		(strcmp((s),(l)) == 0)
+#define XMP_LitNMatch(s,l,n)	(strncmp((s),(l),(n)) == 0)
 	// *** Use the above macros!
 
 #define kTab ((char)0x09)
@@ -370,7 +371,7 @@ static inline bool
 IsPathPrefix ( XMP_StringPtr fullPath, XMP_StringPtr prefix )
 {
 	bool isPrefix = false;
-	XMP_StringLen prefixLen = std::strlen(prefix);
+	XMP_StringLen prefixLen = strlen(prefix);
 	if ( XMP_LitNMatch ( prefix, fullPath, prefixLen ) ) {
 		char separator = fullPath[prefixLen];
 		if ( (separator == 0) || (separator == '/') ||
Index: xmpsdk/src/XMPMeta.cpp
===================================================================
--- xmpsdk/src/XMPMeta.cpp.orig
+++ xmpsdk/src/XMPMeta.cpp
@@ -20,6 +20,9 @@
 #include "UnicodeInlines.incl_cpp"
 #include "UnicodeConversions.hpp"
 
+#include <string.h>
+#include <stdio.h>
+
 #if XMP_DebugBuild
 	#include <iostream>
 #endif
Index: src/value.cpp
===================================================================
--- src/value.cpp.orig
+++ src/value.cpp
@@ -40,6 +40,7 @@ EXIV2_RCSID("@(#) $Id: value.cpp 1421 20
 #include <iostream>
 #include <iomanip>
 #include <sstream>
+#include <stdio.h>
 #include <cassert>
 #include <cstring>
 #include <ctime>

Places

File gcc43.diff of Package exiv2 (Revision 8932e48c8ee82eebb3e9d1ea7ad1cbf6)

Places