diff --git a/src/xercesc/util/AutoSense.hpp b/src/xercesc/util/AutoSense.hpp
index d1618208e08ee8b7b991e265b06101c7c2526314..b149c896d379554747c741f40c8e75b7f8e7cdd9 100644
--- a/src/xercesc/util/AutoSense.hpp
+++ b/src/xercesc/util/AutoSense.hpp
@@ -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
diff --git a/src/xercesc/util/Compilers/SCOCCDefs.cpp b/src/xercesc/util/Compilers/SCOCCDefs.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..382a700bc792d1644e96fc772155e0f13a7d89f0
--- /dev/null
+++ b/src/xercesc/util/Compilers/SCOCCDefs.cpp
@@ -0,0 +1,44 @@
+/*
+ * 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$
+ * 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);
+}
diff --git a/src/xercesc/util/Compilers/SCOCCDefs.hpp b/src/xercesc/util/Compilers/SCOCCDefs.hpp
index 9f60ac0a2857200439d623c86fee0c533ce1fbd2..f04d65eab2c6ce9febf12860b3633215d88ca54e 100644
--- a/src/xercesc/util/Compilers/SCOCCDefs.hpp
+++ b/src/xercesc/util/Compilers/SCOCCDefs.hpp
@@ -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 @@ typedef int             XMLInt32;
 #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.
diff --git a/src/xercesc/util/Platforms/UnixWare/UnixWarePlatformUtils.cpp b/src/xercesc/util/Platforms/UnixWare/UnixWarePlatformUtils.cpp
index f0807164c6b52be8484ac28fae82009534ab2bb2..c09bc30ffafc85f20f080029d64b15f0ac3542f5 100644
--- a/src/xercesc/util/Platforms/UnixWare/UnixWarePlatformUtils.cpp
+++ b/src/xercesc/util/Platforms/UnixWare/UnixWarePlatformUtils.cpp
@@ -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 @@ XMLTransService* XMLPlatformUtils::makeTransService()
 // ---------------------------------------------------------------------------
 //  XMLPlatformUtils: The panic method
 // ---------------------------------------------------------------------------
-void XMLPlatformUtils::panic(const PanicReasons reason)
+void XMLPlatformUtils::panic(const PanicHandler::PanicReasons reason)
 {
     fgUserPanicHandler? fgUserPanicHandler->panic(reason) : fgDefaultPanicHandler->panic(reason);
 }
diff --git a/src/xercesc/util/Transcoders/Iconv/IconvTransService.cpp b/src/xercesc/util/Transcoders/Iconv/IconvTransService.cpp
index f14fa14fd69c06e72ed5888ba2071badd3b20785..5e68cc56def32c6263dcc3132b0df88dea5245c8 100644
--- a/src/xercesc/util/Transcoders/Iconv/IconvTransService.cpp
+++ b/src/xercesc/util/Transcoders/Iconv/IconvTransService.cpp
@@ -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);