cargilld 2004/09/23 14:44:13
Modified: c/src/xercesc/util/Platforms/OS400 OS400Defs.hpp
OS400PlatformUtils.cpp
c/src/xercesc/util/Transcoders/Iconv400 iconv_cnv.cpp
iconv_util.cpp
Log:
Fixes to build on OS400. Thanks to Patrick Townsend and Jay Hansen.
Revision Changes Path
1.3 +3 -3 xml-xerces/c/src/xercesc/util/Platforms/OS400/OS400Defs.hpp
Index: OS400Defs.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/Platforms/OS400/OS400Defs.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- OS400Defs.hpp 8 Sep 2004 13:56:41 -0000 1.2
+++ OS400Defs.hpp 23 Sep 2004 21:44:13 -0000 1.3
@@ -16,6 +16,9 @@
/**
* $Log$
+ * Revision 1.3 2004/09/23 21:44:13 cargilld
+ * Fixes to build on OS400. Thanks to Patrick Townsend and Jay Hansen.
+ *
* Revision 1.2 2004/09/08 13:56:41 peiyongz
* Apache License Version 2.0
*
@@ -29,9 +32,6 @@
* Initial checkin
*
*/
-
-
-#include <xercesc/util/XercesDefs.hpp>
// ---------------------------------------------------------------------------
1.20 +9 -10
xml-xerces/c/src/xercesc/util/Platforms/OS400/OS400PlatformUtils.cpp
Index: OS400PlatformUtils.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Platforms/OS400/OS400PlatformUtils.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- OS400PlatformUtils.cpp 8 Sep 2004 13:56:41 -0000 1.19
+++ OS400PlatformUtils.cpp 23 Sep 2004 21:44:13 -0000 1.20
@@ -22,7 +22,6 @@
// Includes
// ---------------------------------------------------------------------------
#define MY_XP_CPLUSPLUS
-#include "OS400PlatformUtils.hpp"
#include <pthread.h>
#include <xercesc/util/PlatformUtils.hpp>
#include <xercesc/util/RuntimeException.hpp>
@@ -38,8 +37,13 @@
#include <mimchint.h>
#include <string.h>
#include <qmhsndpm.h>
+#include <qmhrtvm.h>
+#include <qusec.h>
+#include <unistd.h>
+#include <string.h>
#include <except.h>
-#include <mih/cmpswp.h>
+#include <mih/cmpswp.h>
+#include "OS400PlatformUtils.hpp"
#include <xercesc/util/OutOfMemoryException.hpp>
#if defined (XML_USE_ICONV400_TRANSCODER)
@@ -115,8 +119,7 @@
XMLMsgLoader* retVal;
try
{
-#if defined(XML_USE_MSGFILE_MESSAGELOADER)
- #include <xercesc/util/MsgLoaders/MsgFile/MsgLoader.hpp>
+#if defined(XML_USE_MSGFILE_MESSAGELOADER)
retVal = new MsgCatalogLoader(msgDomain);
#elif defined (XML_USE_ICU_MESSAGELOADER)
retVal = new ICUMsgLoader(msgDomain);
@@ -212,8 +215,6 @@
return (unsigned int)retVal;
}
-#include <qmhrtvm.h>
-#include <qusec.h>
FileHandle XMLPlatformUtils::openFile(const XMLCh* const fileName
, MemoryManager* const manager)
{ char errno_id[7];
@@ -343,9 +344,7 @@
to no be important that we convert the name to the real path we will
only verify that the path exists - note that this may make AS/400 output a
different error for the pathname but customer should
be able to determine what the name is suppose to be*/
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
+
char *realpath(const char *file_name, char *resolved_name)
{
if (file_name== NULL)
1.4 +4 -0 xml-xerces/c/src/xercesc/util/Transcoders/Iconv400/iconv_cnv.cpp
Index: iconv_cnv.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Transcoders/Iconv400/iconv_cnv.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- iconv_cnv.cpp 8 Sep 2004 13:56:45 -0000 1.3
+++ iconv_cnv.cpp 23 Sep 2004 21:44:13 -0000 1.4
@@ -16,6 +16,9 @@
/**
* $Log$
+ * Revision 1.4 2004/09/23 21:44:13 cargilld
+ * Fixes to build on OS400. Thanks to Patrick Townsend and Jay Hansen.
+ *
* Revision 1.3 2004/09/08 13:56:45 peiyongz
* Apache License Version 2.0
*
@@ -47,6 +50,7 @@
#include <iconv_cnv.hpp>
#include <qmhrtvm.h>
#include <qusec.h>
+#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/util/Platforms/OS400/OS400PlatformUtils.hpp>
#include <iconv.h>
#include <errno.h>
1.4 +4 -0
xml-xerces/c/src/xercesc/util/Transcoders/Iconv400/iconv_util.cpp
Index: iconv_util.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Transcoders/Iconv400/iconv_util.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- iconv_util.cpp 8 Sep 2004 13:56:45 -0000 1.3
+++ iconv_util.cpp 23 Sep 2004 21:44:13 -0000 1.4
@@ -16,6 +16,9 @@
/**
* $Log$
+ * Revision 1.4 2004/09/23 21:44:13 cargilld
+ * Fixes to build on OS400. Thanks to Patrick Townsend and Jay Hansen.
+ *
* Revision 1.3 2004/09/08 13:56:45 peiyongz
* Apache License Version 2.0
*
@@ -37,6 +40,7 @@
*/
#include <iconv.h>
+#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/util/Platforms/OS400/OS400PlatformUtils.hpp>
#include <stdlib.h>
#include <unistd.h>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
