File gcc43.diff of Package exiv2
--- xmpsdk/src/XMPCore_Impl.hpp
+++ xmpsdk/src/XMPCore_Impl.hpp 2008/02/10 08:56:35
@@ -19,6 +19,7 @@
#include "client-glue/WXMPMeta.hpp"
+#include <string.h>
#include <vector>
#include <string>
#include <map>
@@ -88,8 +89,8 @@
#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)
@@ -369,7 +370,7 @@
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 == '/') ||
--- xmpsdk/src/XMPMeta.cpp
+++ xmpsdk/src/XMPMeta.cpp 2008/02/10 08:55:14
@@ -20,6 +20,8 @@
#include "UnicodeInlines.incl_cpp"
#include "UnicodeConversions.hpp"
+#include <string.h>
+
#if XMP_DebugBuild
#include <iostream>
#endif