You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
gentoo-overlay/dev-libs/xalan-c/files/1.11.0_pre797991-bugfixes.p...

50 lines
1.4 KiB

--- a/src/xalanc/PlatformSupport/XalanNLSMessageLoader.cpp
+++ b/src/xalanc/PlatformSupport/XalanNLSMessageLoader.cpp
@@ -28,7 +28,7 @@
#include <xalanc/PlatformSupport/DOMStringHelper.hpp>
#include <cstring>
-
+#include <cstdio>
#include <cerrno>
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<int>(m_catalogHandle) == -1)
+ if (reinterpret_cast<long>(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<int>(m_catalogHandle) == -1)
+ if (reinterpret_cast<long>(m_catalogHandle) == -1)
{
// for transcoding to Unicode
const XalanDOMString errorMsg("Message can't be retrieved: the message catalog is not open.", m_memoryManager );