diff -Naur xml-xalan.orig/c/src/xalanc/PlatformSupport/XalanNLSMessageLoader.cpp xml-xalan/c/src/xalanc/PlatformSupport/XalanNLSMessageLoader.cpp --- xml-xalan.orig/c/src/xalanc/PlatformSupport/XalanNLSMessageLoader.cpp 2009-07-27 00:23:08.507787691 +0200 +++ xml-xalan/c/src/xalanc/PlatformSupport/XalanNLSMessageLoader.cpp 2009-07-27 00:53:50.781756249 +0200 @@ -28,7 +28,7 @@ #include #include - +#include #include XALAN_CPP_NAMESPACE_BEGIN @@ -44,7 +44,7 @@ XalanNLSMessageLoader::~XalanNLSMessageLoader() { - if ((int)m_catalogHandle != -1) + if ((long)m_catalogHandle != -1) { catclose(m_catalogHandle); } @@ -77,7 +77,7 @@ */ m_catalogHandle = catopen(fileName, 0); - if (reinterpret_cast(m_catalogHandle) == -1) + if (reinterpret_cast(m_catalogHandle) == -1) { // Probably have to call panic here // the user will get an error with retrieving messages @@ -87,8 +87,8 @@ bool XalanNLSMessageLoader::loadMsg( - XalanMessages::Codes msgToLoad - XalanDOMChar* toFill + XalanMessages::Codes msgToLoad, + XalanDOMChar* toFill, XalanSize_t maxChars) { @@ -99,7 +99,7 @@ return bRetValue; } - if (static_cast(m_catalogHandle) == -1) + if (reinterpret_cast(m_catalogHandle) == -1) { // for transcoding to Unicode const XalanDOMString errorMsg("Message can't be retrieved: the message catalog is not open.", m_memoryManager );