amassari 2005/01/13 04:36:02
Modified: c/src/xercesc/util AutoSense.hpp
c/src/xercesc/util/Transcoders/Iconv IconvTransService.cpp
c/src/xercesc/util/Compilers SCOCCDefs.hpp
c/src/xercesc/util/Platforms/UnixWare
UnixWarePlatformUtils.cpp
Added: c/src/xercesc/util/Compilers SCOCCDefs.cpp
Log:
Support for UnixWare 7.1.1 (jira# 1148)
Revision Changes Path
1.18 +5 -0 xml-xerces/c/src/xercesc/util/AutoSense.hpp
Index: AutoSense.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/AutoSense.hpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- AutoSense.hpp 16 Dec 2004 03:21:39 -0000 1.17
+++ AutoSense.hpp 13 Jan 2005 12:36:01 -0000 1.18
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.18 2005/01/13 12:36:01 amassari
+ * Support for UnixWare 7.1.1 (jira# 1148)
+ *
* Revision 1.17 2004/12/16 03:21:39 cargilld
* Fix 390 build.
*
@@ -312,6 +315,8 @@
#elif defined(__MWERKS__)
#define XML_METROWERKS
#elif defined(__OS400__)
+#elif defined(XML_UNIXWARE)
+ #define XML_SCOCC
#else
#error Code requires port to current development environment
#endif
1.19 +2 -2
xml-xerces/c/src/xercesc/util/Transcoders/Iconv/IconvTransService.cpp
Index: IconvTransService.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Transcoders/Iconv/IconvTransService.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- IconvTransService.cpp 18 Nov 2004 16:20:06 -0000 1.18
+++ IconvTransService.cpp 13 Jan 2005 12:36:01 -0000 1.19
@@ -28,7 +28,7 @@
#include <xercesc/framework/MemoryManager.hpp>
#include <wchar.h>
-#if defined (XML_GCC) || defined (XML_PTX) || defined (XML_IBMVAOS2) ||
defined(XML_LINUX)
+#if defined (XML_GCC) || defined (XML_PTX) || defined (XML_IBMVAOS2) ||
defined(XML_LINUX) || defined (XML_UNIXWARE)
#if defined(XML_BEOS)
wint_t towlower(wint_t wc) {
return ((wc>'A')&&(wc<'Z') ? wc+'a'-'A' : wc);
1.7 +9 -1 xml-xerces/c/src/xercesc/util/Compilers/SCOCCDefs.hpp
Index: SCOCCDefs.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/Compilers/SCOCCDefs.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SCOCCDefs.hpp 8 Sep 2004 13:56:32 -0000 1.6
+++ SCOCCDefs.hpp 13 Jan 2005 12:36:02 -0000 1.7
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.7 2005/01/13 12:36:02 amassari
+ * Support for UnixWare 7.1.1 (jira# 1148)
+ *
* Revision 1.6 2004/09/08 13:56:32 peiyongz
* Apache License Version 2.0
*
@@ -85,7 +88,7 @@
// Indicate that we support C++ namespace
// Do not define it if the compile cannot handle C++ namespace
//
---------------------------------------------------------------------------
-// #define XERCES_HAS_CPP_NAMESPACE
+#define XERCES_HAS_CPP_NAMESPACE
//
---------------------------------------------------------------------------
// Define our version of the XML character
@@ -126,6 +129,11 @@
#define XERCES_DEBUG
#endif
+#define XERCES_NEW_IOSTREAMS
+#define XERCES_STD_NAMESPACE
+
+int stricmp(const char* const str1, const char* const str2);
+int strnicmp(const char* const str1, const char* const str2, const unsigned
int count);
//
---------------------------------------------------------------------------
// The name of the DLL that is built by the CC version of the system.
1.1 xml-xerces/c/src/xercesc/util/Compilers/SCOCCDefs.cpp
Index: SCOCCDefs.cpp
===================================================================
/*
* Copyright 1999-2000,2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/*
* $Log: SCOCCDefs.cpp,v $
* Revision 1.1 2005/01/13 12:36:02 amassari
* Support for UnixWare 7.1.1 (jira# 1148)
*
*
*/
// ---------------------------------------------------------------------------
// Includes
// ---------------------------------------------------------------------------
#include <xercesc/util/Compilers/SCOCCDefs.hpp>
#include <strings.h>
#include <string.h>
int stricmp(const char* const str1, const char* const str2)
{
return strcasecmp(str1, str2);
}
int strnicmp(const char* const str1, const char* const str2, const unsigned
int count)
{
if (count == 0)
return 0;
return strncasecmp( str1, str2, (size_t)count);
}
1.19 +4 -1
xml-xerces/c/src/xercesc/util/Platforms/UnixWare/UnixWarePlatformUtils.cpp
Index: UnixWarePlatformUtils.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Platforms/UnixWare/UnixWarePlatformUtils.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- UnixWarePlatformUtils.cpp 8 Sep 2004 13:56:43 -0000 1.18
+++ UnixWarePlatformUtils.cpp 13 Jan 2005 12:36:02 -0000 1.19
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.19 2005/01/13 12:36:02 amassari
+ * Support for UnixWare 7.1.1 (jira# 1148)
+ *
* Revision 1.18 2004/09/08 13:56:43 peiyongz
* Apache License Version 2.0
*
@@ -240,7 +243,7 @@
//
---------------------------------------------------------------------------
// XMLPlatformUtils: The panic method
//
---------------------------------------------------------------------------
-void XMLPlatformUtils::panic(const PanicReasons reason)
+void XMLPlatformUtils::panic(const PanicHandler::PanicReasons reason)
{
fgUserPanicHandler? fgUserPanicHandler->panic(reason) :
fgDefaultPanicHandler->panic(reason);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
