dbertoni 01/09/26 08:25:17
Modified: c/src/XalanTransformer XalanTransformer.cpp
XalanTransformerDefinitions.hpp
XalanTransformerOutputStream.cpp
XalanTransformerOutputStream.hpp
Log:
32/64-bit fixes.
Revision Changes Path
1.36 +2 -2 xml-xalan/c/src/XalanTransformer/XalanTransformer.cpp
Index: XalanTransformer.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XalanTransformer/XalanTransformer.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- XalanTransformer.cpp 2001/09/17 17:14:55 1.35
+++ XalanTransformer.cpp 2001/09/26 15:25:17 1.36
@@ -891,7 +891,7 @@
const char* const theStylesheetErrorMessage =
"An invalid compiled stylesheet was provided.";
- const unsigned int theLength =
+ const XalanDOMString::size_type theLength =
length(theStylesheetErrorMessage);
m_errorMessage.resize(theLength + 1, '\0');
@@ -999,7 +999,7 @@
const char* const theParsedSourceErrorMessage =
"An invalid parsed source was provided.";
- const unsigned int theLength =
+ const XalanDOMString::size_type theLength =
length(theParsedSourceErrorMessage);
m_errorMessage.resize(theLength + 1, '\0');
1.6 +7 -1
xml-xalan/c/src/XalanTransformer/XalanTransformerDefinitions.hpp
Index: XalanTransformerDefinitions.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanTransformer/XalanTransformerDefinitions.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XalanTransformerDefinitions.hpp 2001/06/12 19:12:54 1.5
+++ XalanTransformerDefinitions.hpp 2001/09/26 15:25:17 1.6
@@ -63,6 +63,10 @@
+#include <stddef.h>
+
+
+
#if defined(XALAN_TRANSFORMER_BUILD_DLL)
#define XALAN_TRANSFORMER_EXPORT XALAN_PLATFORM_EXPORT
@@ -82,6 +86,8 @@
{
#endif
+ typedef size_t CallbackSizeType;
+
/**
* Callback function passed to the XalanTransformer APIs.
* Used to process transformation output in blocks of data.
@@ -100,7 +106,7 @@
* @param handle handle of XalanTransformer instance.
* @return number of bytes written
*/
-typedef unsigned long (*XalanOutputHandlerType) (const char*, unsigned long,
void*);
+typedef CallbackSizeType (*XalanOutputHandlerType) (const char*,
CallbackSizeType, void*);
/**
* Callback function passed to the XalanTransformer APIs.
1.7 +1 -1
xml-xalan/c/src/XalanTransformer/XalanTransformerOutputStream.cpp
Index: XalanTransformerOutputStream.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanTransformer/XalanTransformerOutputStream.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XalanTransformerOutputStream.cpp 2001/06/12 19:12:54 1.6
+++ XalanTransformerOutputStream.cpp 2001/09/26 15:25:17 1.7
@@ -90,7 +90,7 @@
void
XalanTransformerOutputStream::writeData(
const char* theBuffer,
- unsigned long theBufferLength)
+ size_type theBufferLength)
{
const size_t theBytesWritten = m_outputHandler(theBuffer,
theBufferLength, m_outputHandle);
1.8 +3 -2
xml-xalan/c/src/XalanTransformer/XalanTransformerOutputStream.hpp
Index: XalanTransformerOutputStream.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanTransformer/XalanTransformerOutputStream.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XalanTransformerOutputStream.hpp 2001/06/12 19:12:54 1.7
+++ XalanTransformerOutputStream.hpp 2001/09/26 15:25:17 1.8
@@ -94,8 +94,9 @@
protected:
virtual void
- writeData(const char* theBuffer,
- unsigned long theBufferLength);
+ writeData(
+ const char* theBuffer,
+ size_type theBufferLength);
virtual void
doFlush();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
