[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Xerces-c 2.5.0



As Attach File I send a patch, which I use to make xerces-c-src_2_5_0 possible to compile in OpenBSD 3.6.
There's only view main changes in configure's and Makefile's. I use i386 architecture.
Please check, is this correct.

Piotr Rojewski

----------------------------------------------------------------------
Startuj z INTERIA.PL! >>> http://link.interia.pl/f186c
diff xerces-c-src_2_5_0/samples/Makefile.incl xerces-c-src_2_5_0_chg/samples/Makefile.incl
--- xerces-c-src_2_5_0/samples/Makefile.incl	Thu Dec 11 00:50:25 2003
+++ xerces-c-src_2_5_0_chg/samples/Makefile.incl	Wed Apr  6 15:02:17 2005
@@ -239,6 +239,21 @@
   SHLIBSUFFIX=.so
 endif
 
+#=============== OPENBSD SPECIFIC OPTIONS =========================
+ifeq (${PLATFORM}, OPENBSD)
+  CMP= -c ${CXXFLAGS}
+  CC= ${COMPILER} -c -D${PLATFORM} -fPIC
+  LINK = ${COMPILER} -D${PLATFORM} -fPIC ${LDFLAGS}
+  PLATFORM_LIB_LINK_OPTIONS=-Wl,-rpath,${XERCESCROOT}/lib
+  ifdef ICUROOT
+    PLATFORM_LIB_LINK_OPTIONS+=-L${ICUROOT} -Wl,-rpath,${ICUROOT}
+    EXTRA_LINK_OPTIONS=-licudata -lstdc++ ${EXTRA_LIBS}
+  else
+    EXTRA_LINK_OPTIONS=${EXTRA_LIBS} -lstdc++
+  endif
+  SHLIBSUFFIX=.so
+endif
+
 #=============== NETBSD SPECIFIC OPTIONS =========================
 ifeq (${PLATFORM}, NETBSD)
   CMP= -c ${CXXFLAGS}
diff xerces-c-src_2_5_0/samples/configure xerces-c-src_2_5_0_chg/samples/configure
--- xerces-c-src_2_5_0/samples/configure	Wed Feb 11 22:22:05 2004
+++ xerces-c-src_2_5_0_chg/samples/configure	Wed Apr  6 15:39:25 2005
@@ -1363,6 +1363,7 @@
         *-*-linux*)     platform=LINUX ;;
         *-*-nto*)       platform=QNX ;;
         *-*-freebsd*)   platform=FREEBSD ;;
+        *-*-openbsd*)   platform=OPENBSD ;;
         *-*-netbsd*)    platform=NETBSD ;;
         *-*-irix*)      platform=IRIX ;;
         *-*-aix*)       platform=AIX ;;
diff xerces-c-src_2_5_0/samples/configure.in xerces-c-src_2_5_0_chg/samples/configure.in
--- xerces-c-src_2_5_0/samples/configure.in	Wed Feb 11 22:22:05 2004
+++ xerces-c-src_2_5_0_chg/samples/configure.in	Wed Apr  6 14:40:41 2005
@@ -40,6 +40,7 @@
         *-*-linux*)     platform=LINUX ;;
         *-*-nto*)       platform=QNX ;;
         *-*-freebsd*)   platform=FREEBSD ;;
+        *-*-openbsd*)   platform=OPENBSD ;;
         *-*-netbsd*)    platform=NETBSD ;;
         *-*-irix*)      platform=IRIX ;;
         *-*-aix*)       platform=AIX ;;
diff xerces-c-src_2_5_0/samples/runConfigure xerces-c-src_2_5_0_chg/samples/runConfigure
--- xerces-c-src_2_5_0/samples/runConfigure	Tue Jan 13 20:42:18 2004
+++ xerces-c-src_2_5_0_chg/samples/runConfigure	Wed Apr  6 14:39:26 2005
@@ -85,7 +85,7 @@
     echo "       where options may be any of the following:"
     echo "       -p <platform> (accepts 'aix', 'beos', 'linux', 'freebsd', 'netbsd',
             'solaris', 'hp-10', 'hp-11', 'openserver', 'unixware',
-            'os400', 'irix', 'ptx', 'tru64', 'macosx', 'cygwin')
+            'os400', 'irix', 'ptx', 'tru64', 'macosx', 'cygwin', 'openbsd')
             [required: no default]"
     echo "       -c <C compiler name> (e.g. gcc, cc, xlc_r, icc or ecc)"
     echo "            [default is make default; cc for gnu make]"
@@ -205,7 +205,7 @@
 # Now check if the options are correct or not, bail out if incorrect
 #
 case $platform in
-   aix | openserver | unixware | beos | linux | freebsd | netbsd | solaris | hp-10 | hp-11 | os400 | irix | ptx | tru64 | macosx | cygwin)
+   aix | openserver | unixware | beos | linux | freebsd | netbsd | solaris | hp-10 | hp-11 | os400 | irix | ptx | tru64 | macosx | cygwin | openbsd)
        # platform has been recognized
        ;;
    *)
@@ -273,6 +273,9 @@
     elif test $platform = "freebsd"; then
         threadingLibs="-pthread -lc_r"
         threadingDefines="-D_THREAD_SAFE -DXML_USE_PTHREADS"
+    elif test $platform = "openbsd"; then
+        threadingLibs="-pthread"
+        threadingDefines="-D_THREAD_SAFE -DXML_USE_PTHREADS"
     elif test $platform = "netbsd"; then
         threadingLibs="-pthread"
         threadingDefines="-D_THREAD_SAFE -DXML_USE_PTHREADS"
@@ -355,7 +358,7 @@
 
 #
 #  aix | beos | linux | hp-11 | solaris |
-#  hp-10 | freebsd | netbsd | irix | openserver | unixware | os400 | ptx | tru64 | macosx
+#  hp-10 | freebsd | netbsd | irix | openserver | unixware | os400 | ptx | tru64 | macosx | openbsd
 #
 if test $bitsToBuild = 64; then
     bitstobuildDefines=" -DXML_BITSTOBUILD_64 "
@@ -397,6 +400,13 @@
 transcodingLibs=""       # by default don't suppose the libiconv is necessary
 transcodingDefines=""
 if test $platform = "freebsd"; then
+	transcodingTest="true"
+elif test $platform = "openbsd"; then
+	transcodingTest="true"
+else
+	transcodingTest="false"
+fi
+if test $transcodingTest = "true"; then
     if test -n "${XERCESCROOT}"; then
        # try lookup the configuration results
        . "${XERCESCROOT}/version.incl"
diff xerces-c-src_2_5_0/src/xercesc/Makefile.incl xerces-c-src_2_5_0_chg/src/xercesc/Makefile.incl
--- xerces-c-src_2_5_0/src/xercesc/Makefile.incl	Thu Feb 12 21:44:10 2004
+++ xerces-c-src_2_5_0_chg/src/xercesc/Makefile.incl	Wed Apr  6 12:38:23 2005
@@ -406,6 +406,23 @@
 LD_SONAME = -Wl,-soname,${SO_NAME}
 endif
 
+#=============== OPENBSD SPECIFIC OPTIONS =========================
+ifeq (${PLATFORM}, OPENBSD)
+MAKE_SHARED = ${CXX} -D${PLATFORM} -shared -fPIC ${LDFLAGS}
+MAKE_SHARED_C = ${CC} -D${PLATFORM} -shared -fPIC ${LDFLAGS}
+ifeq (${TRANSCODER}, ICU)
+    PLATFORM_COMPILE_OPTIONS = -fPIC -D${PLATFORM} -I/usr/local/include
+    ALLLIBS = ${LIBS} -L/usr/local/lib -licuuc -L${ICUROOT} -licudata -lgcc
+else
+    PLATFORM_COMPILE_OPTIONS = -fPIC -D${PLATFORM}
+    ALLLIBS = ${LIBS}
+endif
+SHLIBSUFFIX=.so
+ICUSHLIBSUFFIX=.so
+## Compiler switch to embed a library name
+LD_SONAME = -Wl,-soname,${SO_NAME}
+endif
+
 #=============== NETBSD SPECIFIC OPTIONS =========================
 ifeq (${PLATFORM}, NETBSD)
 MAKE_SHARED = ${CXX} -D${PLATFORM} -shared -fPIC ${LDFLAGS}
diff xerces-c-src_2_5_0/src/xercesc/configure xerces-c-src_2_5_0_chg/src/xercesc/configure
--- xerces-c-src_2_5_0/src/xercesc/configure	Wed Feb  4 14:26:44 2004
+++ xerces-c-src_2_5_0_chg/src/xercesc/configure	Wed Apr  6 16:05:06 2005
@@ -1332,6 +1332,7 @@
         *-*-osf*)		platform=TRU64 ;;
         *-apple-*)		platform=MACOSX ;;
         *-*-cygwin*)    platform=CYGWIN ;;
+        *-*-openbsd*)   platform=OPENBSD ;;
         *-*-interix*)   platform=INTERIX ;;
         *)              platform=UNKNOWN ;;
 esac
@@ -1520,6 +1521,7 @@
 util/Platforms/Interix/Makefile \
 util/Platforms/Linux/Makefile \
 util/Platforms/FreeBSD/Makefile \
+util/Platforms/OpenBSD/Makefile \
 util/Platforms/NetBSD/Makefile \
 util/Platforms/HPUX/Makefile \
 util/Platforms/OS390/Makefile \
@@ -1678,6 +1680,7 @@
 util/Platforms/Interix/Makefile \
 util/Platforms/Linux/Makefile \
 util/Platforms/FreeBSD/Makefile \
+util/Platforms/OpenBSD/Makefile \
 util/Platforms/NetBSD/Makefile \
 util/Platforms/HPUX/Makefile \
 util/Platforms/OS390/Makefile \
diff xerces-c-src_2_5_0/src/xercesc/configure.in xerces-c-src_2_5_0_chg/src/xercesc/configure.in
--- xerces-c-src_2_5_0/src/xercesc/configure.in	Thu Feb 12 21:44:10 2004
+++ xerces-c-src_2_5_0_chg/src/xercesc/configure.in	Wed Apr  6 13:59:55 2005
@@ -58,6 +58,7 @@
         *-*-osf*)		platform=TRU64 ;;
         *-apple-*)		platform=MACOSX ;;
         *-*-cygwin*)    platform=CYGWIN ;;
+	*-*-openbsd*)	platform=OPENBSD ;;
         *)              platform=UNKNOWN ;;
 esac
 AC_SUBST(platform)
@@ -128,6 +129,7 @@
 util/Platforms/QNX/Makefile \
 util/Platforms/Linux/Makefile \
 util/Platforms/FreeBSD/Makefile \
+util/Platforms/OpenBSD/Makefile \
 util/Platforms/NetBSD/Makefile \
 util/Platforms/HPUX/Makefile \
 util/Platforms/OS390/Makefile \
diff xerces-c-src_2_5_0/src/xercesc/runConfigure xerces-c-src_2_5_0_chg/src/xercesc/runConfigure
--- xerces-c-src_2_5_0/src/xercesc/runConfigure	Wed Feb  4 14:26:44 2004
+++ xerces-c-src_2_5_0_chg/src/xercesc/runConfigure	Wed Apr  6 14:04:45 2005
@@ -88,7 +88,7 @@
     echo "       -p <platform> (accepts 'aix', 'beos', 'linux', 'freebsd', 
             'netbsd', 'solaris', 'hp-10', 'hp-11', 'openserver', 'unixware', 
             'os400', 'irix', 'ptx', 'tru64', 'macosx', 'cygwin', 'qnx',
-            'interix')
+            'interix', 'openbsd')
             [required; no default]"
     echo "       -c <C compiler name> (e.g. gcc, cc, xlc_r, qcc, icc or ecc) 
             [default is make default; cc for gnu make]"
@@ -243,7 +243,7 @@
 #
 
 case $platform in
-   aix | openserver | unixware | beos | linux | freebsd | netbsd | solaris | hp-10 | hp-11 | os400 | irix | ptx | tru64 | macosx | cygwin | qnx | interix)
+   aix | openserver | unixware | beos | linux | freebsd | netbsd | solaris | hp-10 | hp-11 | os400 | irix | ptx | tru64 | macosx | cygwin | qnx | interix | openbsd)
        # platform has been recognized
        ;;
    *)
@@ -321,6 +321,9 @@
     elif test $platform = "freebsd"; then
         threadingLibs="-pthread -lc_r"
         threadingDefines="-D_THREAD_SAFE -DXML_USE_PTHREADS"
+    elif test $platform = "openbsd"; then
+        threadingLibs="-lpthread"
+        threadingDefines="-D_THREAD_SAFE -DXML_USE_PTHREADS"
     elif test $platform = "netbsd"; then
         threadingLibs="-pthread -lpthread"
         threadingDefines="-D_THREAD_SAFE -DXML_USE_PTHREADS"
@@ -404,7 +407,7 @@
 
 #
 #  aix | beos | linux | hp-11 | solaris |
-#  hp-10 | freebsd | netbsd | irix | openserver | unixware | os400 | ptx | tru64 | macosx
+#  hp-10 | freebsd | netbsd | irix | openserver | unixware | os400 | ptx | tru64 | macosx | openbsd
 #
 if test $bitsToBuild = 64; then
     bitstobuildDefines=" -DXML_BITSTOBUILD_64 "
@@ -476,6 +479,8 @@
  	    TRANSCODER=Cygwin ;
  	    transcodingDefines="-DXML_USE_CYGWIN_TRANSCODER" ;
  	elif test $platform = "freebsd"; then
+           TRANSCODER=IconvFBSD ;
+ 	elif test $platform = "openbsd"; then
            TRANSCODER=IconvFBSD ;
        fi ;;
    *)
diff xerces-c-src_2_5_0/src/xercesc/util/AutoSense.hpp xerces-c-src_2_5_0_chg/src/xercesc/util/AutoSense.hpp
--- xerces-c-src_2_5_0/src/xercesc/util/AutoSense.hpp	Wed Feb  4 14:26:44 2004
+++ xerces-c-src_2_5_0_chg/src/xercesc/util/AutoSense.hpp	Wed Apr  6 12:53:48 2005
@@ -225,6 +225,9 @@
 #elif defined(__FreeBSD__)
     #define XML_FREEBSD
     #define XML_UNIX
+#elif defined(__OpenBSD__)
+    #define XML_OPENBSD
+    #define XML_UNIX
 #elif defined(IRIX) || defined(__sgi)
     #define XML_IRIX
     #define XML_UNIX
diff xerces-c-src_2_5_0/src/xercesc/util/Platforms/Makefile.in xerces-c-src_2_5_0_chg/src/xercesc/util/Platforms/Makefile.in
--- xerces-c-src_2_5_0/src/xercesc/util/Platforms/Makefile.in	Wed Feb  4 14:26:44 2004
+++ xerces-c-src_2_5_0_chg/src/xercesc/util/Platforms/Makefile.in	Wed Apr  6 13:32:42 2005
@@ -178,6 +178,9 @@
 ifeq (${PLATFORM}, NETBSD)
     SUBMODULE = NetBSD
 endif
+ifeq (${PLATFORM}, OPENBSD)
+    SUBMODULE = OpenBSD
+endif
 ifeq (${PLATFORM}, HPUX)
     SUBMODULE = HPUX
 endif
diff xerces-c-src_2_5_0/src/xercesc/util/Platforms/OpenBSD/Makefile.in xerces-c-src_2_5_0_chg/src/xercesc/util/Platforms/OpenBSD/Makefile.in
--- xerces-c-src_2_5_0/src/xercesc/util/Platforms/OpenBSD/Makefile.in	Thu Jan  1 01:00:00 1970
+++ xerces-c-src_2_5_0_chg/src/xercesc/util/Platforms/OpenBSD/Makefile.in	Wed Apr  6 12:16:26 2005
@@ -0,0 +1,94 @@
+#
+# The Apache Software License, Version 1.1
+#
+# Copyright (c) 2001 The Apache Software Foundation.  All rights
+# reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+#
+# 3. The end-user documentation included with the redistribution,
+#    if any, must include the following acknowledgment:
+#       "This product includes software developed by the
+#        Apache Software Foundation (http://www.apache.org/)."
+#    Alternately, this acknowledgment may appear in the software itself,
+#    if and wherever such third-party acknowledgments normally appear.
+#
+# 4. The names "Xerces" and "Apache Software Foundation" must
+#    not be used to endorse or promote products derived from this
+#    software without prior written permission. For written
+#    permission, please contact apache\_(_at_)_apache_(_dot_)_org_(_dot_)_
+#
+# 5. Products derived from this software may not be called "Apache",
+#    nor may "Apache" appear in their name, without prior written
+#    permission of the Apache Software Foundation.
+#
+# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+# ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+# ====================================================================
+#
+# This software consists of voluntary contributions made by many
+# individuals on behalf of the Apache Software Foundation, and was
+# originally based on software copyright (c) 2001, International
+# Business Machines, Inc., http://www.ibm.com .  For more information
+# on the Apache Software Foundation, please see
+# <http://www.apache.org/>.
+#
+# $Log: Makefile.in,v $
+# Revision 1.2  2002/07/26 16:49:28  tng
+# [Bug 2681] Can't build with gcc/g++ not named 'gcc'/'g++'.  Patch from Jonathan Lennox.
+#
+# Revision 1.1.1.1  2002/02/01 22:22:24  peiyongz
+# sane_include
+#
+# Revision 1.1  2001/11/29 18:25:18  tng
+# FreeBSD support by Michael Huedepohl.
+#
+#
+
+PLATFORM = @platform@
+CC  = @cc@
+CXX = @cxx@
+GCC = @GCC@
+GXX = @GXX@
+CXXFLAGS = @cxxflags@
+CFLAGS = @cflags@
+PREFIX = @prefix@
+PREFIX_INCLUDE = @prefix_include@
+LDFLAGS = @ldflags@
+LIBS = @libs@
+OSVER = @osver@
+USELIBWWW = @uselibwww@
+MESSAGELOADER = @messageloader@
+TRANSCODER = @transcoder@
+THREADS = @threads@
+
+MODULE = util
+
+include ../../../Makefile.incl
+
+SUBMODULE = Platforms/OpenBSD
+CXXFLAGS += -D_GNU_SOURCE -D__USE_GNU
+CPP_PUBHEADERS = OpenBSDDefs.hpp
+CPP_OBJECTS = OpenBSDPlatformUtils.$(TO)
+
+include ../../Makefile.util.submodule
diff xerces-c-src_2_5_0/src/xercesc/util/Platforms/OpenBSD/OpenBSDDefs.hpp xerces-c-src_2_5_0_chg/src/xercesc/util/Platforms/OpenBSD/OpenBSDDefs.hpp
--- xerces-c-src_2_5_0/src/xercesc/util/Platforms/OpenBSD/OpenBSDDefs.hpp	Thu Jan  1 01:00:00 1970
+++ xerces-c-src_2_5_0_chg/src/xercesc/util/Platforms/OpenBSD/OpenBSDDefs.hpp	Wed Apr  6 13:50:19 2005
@@ -0,0 +1,76 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2001 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ *    if any, must include the following acknowledgment:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowledgment may appear in the software itself,
+ *    if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Xerces" and "Apache Software Foundation" must
+ *    not be used to endorse or promote products derived from this
+ *    software without prior written permission. For written
+ *    permission, please contact apache\_(_at_)_apache_(_dot_)_org_(_dot_)_
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ *    nor may "Apache" appear in their name, without prior written
+ *    permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation, and was
+ * originally based on software copyright (c) 2001, International
+ * Business Machines, Inc., http://www.ibm.com .  For more information
+ * on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+
+/**
+ * $Log: FreeBSDDefs.hpp,v $
+ * Revision 1.1.1.1  2002/02/01 22:22:23  peiyongz
+ * sane_include
+ *
+ * Revision 1.1  2001/11/29 18:25:18  tng
+ * FreeBSD support by Michael Huedepohl.
+ *
+ */
+
+
+// ---------------------------------------------------------------------------
+//  FreeBSD runs in little endian mode
+// ---------------------------------------------------------------------------
+#define ENDIANMODE_LITTLE
+typedef void* FileHandle;
+
+#ifndef OPENBSD
+#define OPENBSD
+#endif
diff xerces-c-src_2_5_0/src/xercesc/util/Platforms/OpenBSD/OpenBSDPlatformUtils.cpp xerces-c-src_2_5_0_chg/src/xercesc/util/Platforms/OpenBSD/OpenBSDPlatformUtils.cpp
--- xerces-c-src_2_5_0/src/xercesc/util/Platforms/OpenBSD/OpenBSDPlatformUtils.cpp	Thu Jan  1 01:00:00 1970
+++ xerces-c-src_2_5_0_chg/src/xercesc/util/Platforms/OpenBSD/OpenBSDPlatformUtils.cpp	Wed Apr  6 13:49:41 2005
@@ -0,0 +1,701 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2001-2004 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ *    if any, must include the following acknowledgment:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowledgment may appear in the software itself,
+ *    if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Xerces" and "Apache Software Foundation" must
+ *    not be used to endorse or promote products derived from this
+ *    software without prior written permission. For written
+ *    permission, please contact apache\_(_at_)_apache_(_dot_)_org_(_dot_)_
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ *    nor may "Apache" appear in their name, without prior written
+ *    permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation, and was
+ * originally based on software copyright (c) 2001, International
+ * Business Machines, Inc., http://www.ibm.com .  For more information
+ * on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+
+/*
+ * $Log: FreeBSDPlatformUtils.cpp,v $
+ * Revision 1.22  2004/01/29 11:51:20  cargilld
+ * Code cleanup changes to get rid of various compiler diagnostic messages.
+ *
+ * Revision 1.21  2004/01/13 16:34:21  cargilld
+ * Misc memory management changes.
+ *
+ * Revision 1.20  2004/01/06 17:31:20  neilg
+ * fix static initialization problems, bug 28517; thanks to Reid Spencer
+ *
+ * Revision 1.19  2003/12/24 15:24:14  cargilld
+ * More updates to memory management so that the static memory manager.
+ *
+ * Revision 1.18  2003/12/19 23:02:25  cargilld
+ * More memory management updates.
+ *
+ * Revision 1.17  2003/12/17 15:16:10  cargilld
+ * Platform update for memory management so that the static memory manager (one
+ * used to call Initialize) is only for static data.
+ *
+ * Revision 1.16  2003/12/17 13:58:02  cargilld
+ * Platform update for memory management so that the static memory manager (one
+ * used to call Initialize) is only for static data.
+ *
+ * Revision 1.15  2003/12/02 15:04:52  amassari
+ * openFile was opening the file for read and write, while only read was required (bug#20169)
+ *
+ * Revision 1.14  2003/10/01 16:32:39  neilg
+ * improve handling of out of memory conditions, bug #23415.  Thanks to David Cargill.
+ *
+ * Revision 1.13  2003/05/15 18:37:47  knoaman
+ * Partial implementation of the configurable memory manager.
+ *
+ * Revision 1.12  2003/04/25 17:19:10  peiyongz
+ * throw exception if getcwd() fails
+ *
+ * Revision 1.11  2003/04/24 02:53:29  peiyongz
+ * Logical Path Resolution
+ *
+ * Revision 1.10  2003/04/21 04:27:22  peiyongz
+ * performance tuning
+ *
+ * Revision 1.9  2003/03/09 16:53:27  peiyongz
+ * PanicHandler
+ *
+ * Revision 1.8  2003/02/23 04:36:55  jberry
+ * Minor bug fixes to FreeBSD port
+ *
+ * Revision 1.7  2002/12/12 16:28:48  peiyongz
+ * MsgCatalogLoader added.
+ *
+ * Revision 1.6  2002/12/02 19:16:26  tng
+ * [Bug 14723] Memory leak in atomicOpsMutex.  Patch from Adam Zell.
+ *
+ * Revision 1.5  2002/11/04 15:13:00  tng
+ * C++ Namespace Support.
+ *
+ * Revision 1.4  2002/07/05 21:29:58  peiyongz
+ * Bug# 10250: patch from James Berry
+ *
+ * Revision 1.3  2002/07/05 21:25:20  peiyongz
+ * Bug# 10250: Implementation of new platform methods,
+ *                      patch from max_(_at_)_cca_(_dot_)_usart_(_dot_)_ru (Max Gotlib)
+ *
+ * Revision 1.2  2002/05/21 20:31:47  tng
+ * Minor update: Remove obsolete code
+ *
+ * Revision 1.1.1.1  2002/02/01 22:22:24  peiyongz
+ * sane_include
+ *
+ * Revision 1.3  2001/12/03 16:25:00  tng
+ * [Bug 5237] PATH_MAX undefined during build without threading support.
+ *
+ * Revision 1.2  2001/12/03 14:45:11  tng
+ * FreeBSD native transcoder (IconvFBSD) added by Max Gotlib.
+ *
+ * Revision 1.1  2001/11/29 18:25:18  tng
+ * FreeBSD support by Michael Huedepohl.
+ *
+ */
+
+
+// ---------------------------------------------------------------------------
+//  Includes
+// ---------------------------------------------------------------------------
+
+#if !defined(APP_NO_THREADS)
+#include    <pthread.h>
+#endif
+
+#ifndef _GNU_SOURCE
+    #error _GNU_SOURCE is not defined in your compile settings
+#endif
+
+#include    <unistd.h>
+#include    <stdio.h>
+#include    <stdlib.h>
+#include    <errno.h>
+// #include    <libgen.h>
+#include    <sys/time.h>
+#include    <string.h>
+#include    <limits.h>
+#include    <xercesc/util/PlatformUtils.hpp>
+#include    <xercesc/util/RuntimeException.hpp>
+#include    <xercesc/util/Janitor.hpp>
+#include    <xercesc/util/Mutexes.hpp>
+#include    <xercesc/util/XMLString.hpp>
+#include    <xercesc/util/XMLUniDefs.hpp>
+#include    <xercesc/util/XMLUni.hpp>
+#include    <xercesc/util/PanicHandler.hpp>
+#include    <xercesc/util/OutOfMemoryException.hpp>
+
+#if defined(XML_USE_ICU_TRANSCODER)
+    #include <xercesc/util/Transcoders/ICU/ICUTransService.hpp>
+#else
+    // Use native transcoder. Same as -DXML_USE_NATIVE_TRANSCODER
+    #include <xercesc/util/Transcoders/IconvFBSD/IconvFBSDTransService.hpp>
+#endif
+
+
+#if defined(XML_USE_ICU_MESSAGELOADER)
+    #include <xercesc/util/MsgLoaders/ICU/ICUMsgLoader.hpp>
+#elif defined (XML_USE_ICONV_MESSAGELOADER)
+    #include <xercesc/util/MsgLoaders/MsgCatalog/MsgCatalogLoader.hpp>
+#else
+    // Same as -DXML_USE_INMEM_MESSAGELOADER
+    #include <xercesc/util/MsgLoaders/InMemory/InMemMsgLoader.hpp>
+#endif
+
+
+#if defined (XML_USE_NETACCESSOR_SOCKET)
+    #include <xercesc/util/NetAccessors/Socket/SocketNetAccessor.hpp>
+#endif
+
+XERCES_CPP_NAMESPACE_BEGIN
+
+// ---------------------------------------------------------------------------
+//  XMLPlatformUtils: Private Static Methods
+// ---------------------------------------------------------------------------
+
+XMLNetAccessor* XMLPlatformUtils::makeNetAccessor()
+{
+#if defined (XML_USE_NETACCESSOR_SOCKET)
+    return new SocketNetAccessor();
+#else
+    return 0;
+#endif
+}
+
+
+
+//
+//  This method is called by the platform independent part of this class
+//  when client code asks to have one of the supported message sets loaded.
+//
+
+XMLMsgLoader* XMLPlatformUtils::loadAMsgSet(const XMLCh* const msgDomain)
+{
+    XMLMsgLoader* retVal;
+    try
+    {
+#if defined (XML_USE_ICU_MESSAGELOADER)
+        retVal = new ICUMsgLoader(msgDomain);
+#elif defined (XML_USE_ICONV_MESSAGELOADER)
+        retVal = new MsgCatalogLoader(msgDomain);        
+#else
+        // same as -DXML_USE_INMEM_MESSAGELOADER
+        retVal = new InMemMsgLoader(msgDomain);
+#endif
+    }
+    catch(const OutOfMemoryException&)
+    {
+        throw;
+    }
+    catch(...)
+    {
+        panic(PanicHandler::Panic_CantLoadMsgDomain);
+    }
+    return retVal;
+}
+
+
+//
+//  This method is called very early in the bootstrapping process. This guy
+//  must create a transcoding service and return it. It cannot use any string
+//  methods, any transcoding services, throw any exceptions, etc... It just
+//  makes a transcoding service and returns it, or returns zero on failure.
+//
+
+XMLTransService* XMLPlatformUtils::makeTransService()
+{
+#if defined (XML_USE_ICU_TRANSCODER)
+    // Use ICU transcoding services.
+    // same as -DXML_USE_ICU_MESSAGELOADER
+    return new ICUTransService;
+#else
+    // Use native transcoding services.
+    // same as -DXML_USE_INMEM_MESSAGELOADER
+    return new IconvFBSDTransService;
+
+#endif
+}
+
+// ---------------------------------------------------------------------------
+//  XMLPlatformUtils: The panic method
+// ---------------------------------------------------------------------------
+void XMLPlatformUtils::panic(const PanicHandler::PanicReasons reason)
+{
+    fgUserPanicHandler? fgUserPanicHandler->panic(reason) : fgDefaultPanicHandler->panic(reason);
+
+}
+
+
+// ---------------------------------------------------------------------------
+//  XMLPlatformUtils: File Methods
+// ---------------------------------------------------------------------------
+
+unsigned int XMLPlatformUtils::curFilePos(FileHandle theFile
+                                          , MemoryManager* const manager)
+{
+    if (theFile == NULL)
+	ThrowXMLwithMemMgr(XMLPlatformUtilsException,
+		 XMLExcepts::CPtr_PointerIsZero, manager);
+    off_t curPos = ftell( (FILE*)theFile);
+    if (curPos == -1)
+        ThrowXMLwithMemMgr(XMLPlatformUtilsException,
+                 XMLExcepts::File_CouldNotGetSize, manager);
+
+    return (unsigned int)curPos;
+}
+
+void XMLPlatformUtils::closeFile(FileHandle theFile
+                                 , MemoryManager* const manager)
+{
+    if (theFile == NULL)
+	ThrowXMLwithMemMgr(XMLPlatformUtilsException,
+		 XMLExcepts::CPtr_PointerIsZero, manager);
+    if (fclose((FILE*)theFile))
+        ThrowXMLwithMemMgr(XMLPlatformUtilsException,
+                 XMLExcepts::File_CouldNotCloseFile, manager);
+}
+
+unsigned int XMLPlatformUtils::fileSize(FileHandle theFile
+                                        , MemoryManager* const manager)
+{
+    if (theFile == NULL)
+	ThrowXMLwithMemMgr(XMLPlatformUtilsException,
+		 XMLExcepts::CPtr_PointerIsZero, manager);
+    // Get the current position
+    off_t curPos = ftell((FILE*) theFile);
+    if (curPos == -1)
+        ThrowXMLwithMemMgr(XMLPlatformUtilsException,
+                 XMLExcepts::File_CouldNotGetCurPos, manager);
+
+    // Seek to the end and save that value for return
+    if (fseek((FILE*) theFile, 0, SEEK_END))
+        ThrowXMLwithMemMgr(XMLPlatformUtilsException,
+                 XMLExcepts::File_CouldNotSeekToEnd, manager);
+
+    off_t retVal = ftell((FILE*)theFile);
+    if (retVal == -1)
+        ThrowXMLwithMemMgr(XMLPlatformUtilsException,
+                 XMLExcepts::File_CouldNotSeekToEnd, manager);
+
+    // And put the pointer back
+    if (fseek( (FILE*)theFile, curPos, SEEK_SET) )
+        ThrowXMLwithMemMgr(XMLPlatformUtilsException,
+                 XMLExcepts::File_CouldNotSeekToPos, manager);
+
+    return (unsigned int)retVal;
+}
+
+FileHandle XMLPlatformUtils::openFile(const XMLCh* const fileName
+                                      , MemoryManager* const manager)
+{
+    if (fileName == NULL)
+	    ThrowXMLwithMemMgr(XMLPlatformUtilsException,
+		    XMLExcepts::CPtr_PointerIsZero, manager);
+    const char* tmpFileName = XMLString::transcode(fileName, manager);
+    ArrayJanitor<char> janText((char*)tmpFileName, manager);
+    FileHandle retVal = (FileHandle)fopen( tmpFileName , "r" );
+    return retVal;
+}
+
+FileHandle XMLPlatformUtils::openFile(const char* const fileName
+                                      , MemoryManager* const manager)
+{
+    if (fileName == NULL)
+	    ThrowXMLwithMemMgr(XMLPlatformUtilsException,
+		 XMLExcepts::CPtr_PointerIsZero, manager);
+    FileHandle retVal = (FileHandle)fopen( fileName , "r" );
+    return retVal;
+}
+
+FileHandle XMLPlatformUtils::openFileToWrite(const XMLCh* const fileName
+                                             , MemoryManager* const manager)
+{
+    if (fileName == NULL)
+	    ThrowXMLwithMemMgr(XMLPlatformUtilsException,
+		 XMLExcepts::CPtr_PointerIsZero, manager);
+    const char* tmpFileName = XMLString::transcode(fileName, manager);
+    ArrayJanitor<char> janText((char*)tmpFileName, manager);
+    return fopen( tmpFileName , "w" );
+}
+
+FileHandle XMLPlatformUtils::openFileToWrite(const char* const fileName
+                                             , MemoryManager* const manager)
+{
+    if (fileName == NULL)
+	    ThrowXMLwithMemMgr(XMLPlatformUtilsException,
+		 XMLExcepts::CPtr_PointerIsZero, manager);
+    return fopen( fileName , "w" );
+}
+
+FileHandle XMLPlatformUtils::openStdInHandle(MemoryManager* const manager)
+{
+    int nfd = dup(0);
+    if (nfd == -1)
+	    ThrowXMLwithMemMgr(XMLPlatformUtilsException,
+		    XMLExcepts::File_CouldNotDupHandle, manager);
+    return (FileHandle) fdopen(nfd, "r");
+}
+
+unsigned int
+XMLPlatformUtils::readFileBuffer( FileHandle          theFile
+                                , const unsigned int  toRead
+                                , XMLByte* const      toFill
+                                , MemoryManager* const manager)
+{
+    if ( !theFile || !toFill )
+	    ThrowXMLwithMemMgr(XMLPlatformUtilsException,
+		    XMLExcepts::CPtr_PointerIsZero, manager);
+    if (toRead == 0)
+	return 0;
+    size_t noOfItemsRead = fread((void*) toFill, 1, toRead, (FILE*)theFile);
+
+    if(ferror((FILE*)theFile))
+    {
+        ThrowXMLwithMemMgr(XMLPlatformUtilsException,
+                 XMLExcepts::File_CouldNotReadFromFile, manager);
+    }
+
+    return (unsigned int)noOfItemsRead;
+}
+
+void XMLPlatformUtils::writeBufferToFile( FileHandle     const  theFile
+					, long                  toWrite
+					, const XMLByte* const  toFlush 
+                    , MemoryManager* const  manager)
+{
+    if ( !theFile || !toFlush )
+        ThrowXMLwithMemMgr(XMLPlatformUtilsException,
+		    XMLExcepts::CPtr_PointerIsZero, manager);
+    if ( toWrite <= 0 )
+        return;
+
+    const XMLByte* tmpFlush = (const XMLByte*) toFlush;
+    size_t bytesWritten = 0;
+
+    while (true)
+    {
+        bytesWritten = fwrite(tmpFlush, sizeof(XMLByte), toWrite, (FILE*)theFile);
+
+        if(ferror((FILE*)theFile))
+		{
+			ThrowXMLwithMemMgr(XMLPlatformUtilsException,
+				XMLExcepts::File_CouldNotWriteToFile, manager);
+		}
+
+        if (bytesWritten < (size_t) toWrite) //incomplete write
+        {
+            tmpFlush += bytesWritten;
+            toWrite -= bytesWritten;
+            bytesWritten = 0;
+        }
+        else
+            return;
+    }
+}
+
+void XMLPlatformUtils::resetFile(FileHandle theFile
+                                 , MemoryManager* const manager)
+{
+    if (theFile == NULL)
+	ThrowXMLwithMemMgr(XMLPlatformUtilsException,
+		 XMLExcepts::CPtr_PointerIsZero, manager);
+    // Seek to the start of the file
+    if (fseek((FILE*)theFile, 0, SEEK_SET))
+        ThrowXMLwithMemMgr(XMLPlatformUtilsException,
+                 XMLExcepts::File_CouldNotResetFile, manager);
+}
+
+
+// ---------------------------------------------------------------------------
+//  XMLPlatformUtils: File system methods
+// ---------------------------------------------------------------------------
+XMLCh* XMLPlatformUtils::getFullPath(const XMLCh* const srcPath,
+                                     MemoryManager* const manager)
+{
+
+    //
+    //  NOTE: THe path provided has always already been opened successfully,
+    //  so we know that its not some pathological freaky path. It comes in
+    //  in native format, and goes out as Unicode always
+    //
+    char* newSrc = XMLString::transcode(srcPath, manager);
+    ArrayJanitor<char> janText(newSrc, manager);
+
+    // Use a local buffer that is big enough for the largest legal path
+    char absPath[PATH_MAX + 1];
+    // get the absolute path
+    char* retPath = realpath(newSrc, &absPath[0]);
+
+    if (!retPath)
+    {
+        ThrowXMLwithMemMgr(XMLPlatformUtilsException, XMLExcepts::File_CouldNotGetBasePathName, manager);
+    }
+    return XMLString::transcode(absPath, manager);
+}
+
+bool XMLPlatformUtils::isRelative(const XMLCh* const toCheck
+                                  , MemoryManager* const manager)
+{
+    // Check for pathological case of empty path
+    if (!toCheck[0])
+        return false;
+
+    //
+    //  If it starts with a slash, then it cannot be relative. This covers
+    //  both something like "\Test\File.xml" and an NT Lan type remote path
+    //  that starts with a node like "\\MyNode\Test\File.xml".
+    //
+    if (toCheck[0] == XMLCh('/'))
+        return false;
+
+    // Else assume its a relative path
+    return true;
+}
+
+XMLCh* XMLPlatformUtils::getCurrentDirectory(MemoryManager* const manager)
+{
+    char  dirBuf[PATH_MAX + 2];
+    char  *curDir = getcwd(&dirBuf[0], PATH_MAX + 1);
+
+    if (!curDir)
+    {
+        ThrowXMLwithMemMgr(XMLPlatformUtilsException,
+                 XMLExcepts::File_CouldNotGetBasePathName, manager);
+    }
+
+    return XMLString::transcode(curDir, manager);
+}
+
+inline bool XMLPlatformUtils::isAnySlash(XMLCh c) 
+{
+    return ( chBackSlash == c || chForwardSlash == c);
+}
+
+// ---------------------------------------------------------------------------
+//  XMLPlatformUtils: Timing Methods
+// ---------------------------------------------------------------------------
+
+unsigned long XMLPlatformUtils::getCurrentMillis()
+{
+    struct timeval aTime;
+    gettimeofday(&aTime, NULL);
+    return (unsigned long) (aTime.tv_sec * 1000 + aTime.tv_usec / 1000);
+
+}
+
+// -----------------------------------------------------------------------
+//  Mutex methods
+// -----------------------------------------------------------------------
+
+#if !defined(APP_NO_THREADS)
+
+// ---------------------------------------------------------------------------
+//  XMLPlatformUtils: Platform init method
+// ---------------------------------------------------------------------------
+
+static XMLMutex *atomicOpsMutex = 0;
+
+void XMLPlatformUtils::platformInit()
+{
+    //
+    // The atomicOps mutex needs to be created early.
+    // Normally, mutexes are created on first use, but there is a
+    // circular dependency between compareAndExchange() and
+    // mutex creation that must be broken.
+    if(!atomicOpsMutex)
+    {
+        atomicOpsMutex = new (fgMemoryManager) XMLMutex();
+        if (atomicOpsMutex->fHandle == 0)
+            atomicOpsMutex->fHandle = XMLPlatformUtils::makeMutex();
+    }
+}
+
+void* XMLPlatformUtils::makeMutex()
+{
+    pthread_mutex_t* mutex = new pthread_mutex_t;
+    pthread_mutexattr_t*  attr = new pthread_mutexattr_t;
+    pthread_mutexattr_init(attr);
+    pthread_mutexattr_settype(attr, PTHREAD_MUTEX_RECURSIVE);
+    if (pthread_mutex_init(mutex, attr))
+    {
+        ThrowXMLwithMemMgr(XMLPlatformUtilsException,
+                 XMLExcepts::Mutex_CouldNotCreate, fgMemoryManager);
+    }
+    pthread_mutexattr_destroy(attr);
+    delete attr;
+    return (void*)(mutex);
+
+}
+
+void XMLPlatformUtils::closeMutex(void* const mtxHandle)
+{
+    if (mtxHandle != NULL)
+    {
+        if (pthread_mutex_destroy((pthread_mutex_t*) mtxHandle))
+        {
+            ThrowXMLwithMemMgr(XMLPlatformUtilsException,
+                     XMLExcepts::Mutex_CouldNotDestroy, fgMemoryManager);
+        }
+        delete (pthread_mutex_t*)mtxHandle;
+    }
+}
+
+
+void XMLPlatformUtils::lockMutex(void* const mtxHandle)
+{
+    if (mtxHandle != NULL)
+    {
+        if (pthread_mutex_lock((pthread_mutex_t*) mtxHandle))
+        {
+            ThrowXMLwithMemMgr(XMLPlatformUtilsException,
+                     XMLExcepts::Mutex_CouldNotLock, fgMemoryManager);
+        }
+    }
+}
+
+
+void XMLPlatformUtils::unlockMutex(void* const mtxHandle)
+{
+    if (mtxHandle != NULL)
+    {
+        if (pthread_mutex_unlock((pthread_mutex_t*) mtxHandle))
+        {
+            ThrowXMLwithMemMgr(XMLPlatformUtilsException,
+                     XMLExcepts::Mutex_CouldNotUnlock, fgMemoryManager);
+        }
+    }
+}
+
+
+// -----------------------------------------------------------------------
+//  Miscellaneous synchronization methods
+// -----------------------------------------------------------------------
+
+void* XMLPlatformUtils::compareAndSwap(void**            toFill
+                                     , const void* const newValue
+                                     , const void* const toCompare)
+{
+    XMLMutexLock lockMutex(atomicOpsMutex);
+
+    void *retVal = *toFill;
+    if (*toFill == toCompare)
+        *toFill = (void *)newValue;
+
+    return retVal;
+}
+
+int XMLPlatformUtils::atomicIncrement(int &location)
+{
+    XMLMutexLock localLock(atomicOpsMutex);
+
+    return ++location;
+}
+
+int XMLPlatformUtils::atomicDecrement(int &location)
+{
+    XMLMutexLock localLock(atomicOpsMutex);
+
+    return --location;
+}
+
+#else // #if !defined (APP_NO_THREADS)
+
+void XMLPlatformUtils::platformInit()
+{
+}
+
+void* XMLPlatformUtils::makeMutex()
+{
+        return 0;
+}
+
+void XMLPlatformUtils::closeMutex(void* const mtxHandle)
+{
+}
+
+void XMLPlatformUtils::lockMutex(void* const mtxHandle)
+{
+}
+
+void XMLPlatformUtils::unlockMutex(void* const mtxHandle)
+{
+}
+
+void* XMLPlatformUtils::compareAndSwap (void**             toFill,
+                                        const void* const  newValue,
+                                        const void* const  toCompare)
+{
+    void *retVal = *toFill;
+    if (*toFill == toCompare)
+       *toFill = (void *)newValue;
+    return retVal;
+}
+
+int XMLPlatformUtils::atomicIncrement(int &location)
+{
+    return ++location;
+}
+
+int XMLPlatformUtils::atomicDecrement(int &location)
+{
+    return --location;
+}
+
+#endif // APP_NO_THREADS
+
+void XMLPlatformUtils::platformTerm()
+{
+#if !defined(APP_NO_THREADS)
+    // delete the mutex we created
+	closeMutex(atomicOpsMutex->fHandle);
+	atomicOpsMutex->fHandle = 0;
+    delete atomicOpsMutex;
+    atomicOpsMutex = 0;
+#endif
+}
+
+#include <xercesc/util/LogicalPath.c>
+
+XERCES_CPP_NAMESPACE_END
diff xerces-c-src_2_5_0/src/xercesc/util/XercesDefs.hpp xerces-c-src_2_5_0_chg/src/xercesc/util/XercesDefs.hpp
--- xerces-c-src_2_5_0/src/xercesc/util/XercesDefs.hpp	Wed Feb  4 14:26:44 2004
+++ xerces-c-src_2_5_0_chg/src/xercesc/util/XercesDefs.hpp	Wed Apr  6 13:02:24 2005
@@ -290,6 +290,10 @@
 #include    <xercesc/util/Platforms/FreeBSD/FreeBSDDefs.hpp>
 #endif
 
+#if defined(XML_OPENBSD)
+#include    <xercesc/util/Platforms/OpenBSD/OpenBSDDefs.hpp>
+#endif
+
 #if defined(XML_OS390)
 #include    <xercesc/util/Platforms/OS390/OS390Defs.hpp>
 #endif
diff xerces-c-src_2_5_0/tests/Makefile.incl xerces-c-src_2_5_0_chg/tests/Makefile.incl
--- xerces-c-src_2_5_0/tests/Makefile.incl	Thu Dec 11 00:50:26 2003
+++ xerces-c-src_2_5_0_chg/tests/Makefile.incl	Wed Apr  6 15:12:49 2005
@@ -234,6 +234,21 @@
   SHLIBSUFFIX=.so
 endif
 
+#=============== OPENBSD SPECIFIC OPTIONS =========================
+ifeq (${PLATFORM}, OPENBSD)
+  CMP= -c ${CXXFLAGS}
+  CC= ${COMPILER} -c -D${PLATFORM} -fPIC
+  LINK = ${COMPILER} -D${PLATFORM} -fPIC ${LDFLAGS}
+  PLATFORM_LIB_LINK_OPTIONS=-Wl,-rpath,${XERCESCROOT}/lib
+  ifdef ICUROOT
+    PLATFORM_LIB_LINK_OPTIONS+=-L${ICUROOT} -Wl,-rpath,${ICUROOT}
+    EXTRA_LINK_OPTIONS=-licudata -lstdc++ ${EXTRA_LIBS}
+  else
+    EXTRA_LINK_OPTIONS=${EXTRA_LIBS} -lstdc++
+  endif
+  SHLIBSUFFIX=.so
+endif
+
 #=============== NETBSD SPECIFIC OPTIONS =========================
 ifeq (${PLATFORM}, NETBSD)
   CMP= -c ${CXXFLAGS}
diff xerces-c-src_2_5_0/tests/ThreadTest/ThreadTest.cpp xerces-c-src_2_5_0_chg/tests/ThreadTest/ThreadTest.cpp
--- xerces-c-src_2_5_0/tests/ThreadTest/ThreadTest.cpp	Fri Feb 13 14:23:17 2004
+++ xerces-c-src_2_5_0_chg/tests/ThreadTest/ThreadTest.cpp	Wed Apr  6 15:17:22 2005
@@ -122,7 +122,7 @@
 }
 
 
-#elif defined (AIX) || defined(SOLARIS) || defined(LINUX) || defined(HPUX) || defined (OS390) || defined(MACOSX) || defined(FREEBSD) || defined(__CYGWIN__) || defined(__QNXNTO__)
+#elif defined (AIX) || defined(SOLARIS) || defined(LINUX) || defined(HPUX) || defined (OS390) || defined(MACOSX) || defined(FREEBSD) || defined(__CYGWIN__) || defined(__QNXNTO__) || defined(OPENBSD)
 #include <pthread.h>
 #include <unistd.h>
 #include <errno.h>
diff xerces-c-src_2_5_0/tests/configure xerces-c-src_2_5_0_chg/tests/configure
--- xerces-c-src_2_5_0/tests/configure	Sat Dec 13 21:16:35 2003
+++ xerces-c-src_2_5_0_chg/tests/configure	Wed Apr  6 15:41:22 2005
@@ -1363,6 +1363,7 @@
         *-*-linux*)     platform=LINUX ;;
         *-*-nto*)       platform=QNX ;;
         *-*-freebsd*)   platform=FREEBSD ;;
+        *-*-openbsd*)   platform=OPENBSD ;;
         *-*-netbsd*)    platform=NETBSD ;;
         *-*-irix*)      platform=IRIX ;;
         *-*-aix*)       platform=AIX ;;
diff xerces-c-src_2_5_0/tests/configure.in xerces-c-src_2_5_0_chg/tests/configure.in
--- xerces-c-src_2_5_0/tests/configure.in	Sat Dec 13 21:16:35 2003
+++ xerces-c-src_2_5_0_chg/tests/configure.in	Wed Apr  6 15:41:40 2005
@@ -40,6 +40,7 @@
         *-*-linux*)     platform=LINUX ;;
         *-*-nto*)       platform=QNX ;;
         *-*-freebsd*)   platform=FREEBSD ;;
+        *-*-openbsd*)   platform=OPENBSD ;;
         *-*-netbsd*)    platform=NETBSD ;;
         *-*-irix*)      platform=IRIX ;;
         *-*-aix*)       platform=AIX ;;
diff xerces-c-src_2_5_0/tests/runConfigure xerces-c-src_2_5_0_chg/tests/runConfigure
--- xerces-c-src_2_5_0/tests/runConfigure	Tue Jan 13 20:41:37 2004
+++ xerces-c-src_2_5_0_chg/tests/runConfigure	Wed Apr  6 15:14:32 2005
@@ -84,7 +84,7 @@
     echo "       where options may be any of the following:"
     echo "       -p <platform> (accepts 'aix', 'beos', 'linux', 'freebsd', 'netbsd',
             'solaris', 'hp-10', 'hp-11', 'openserver', 'unixware',
-            'os400', 'irix', 'ptx', 'tru64', 'macosx', 'cygwin')
+            'os400', 'irix', 'ptx', 'tru64', 'macosx', 'cygwin', 'openbsd')
             [required: no default]"
     echo "       -c <C compiler name> (e.g. gcc, cc, xlc_r, icc or ecc)"
     echo "            [default is make default; cc for gnu make]"
@@ -204,7 +204,7 @@
 # Now check if the options are correct or not, bail out if incorrect
 #
 case $platform in
-   aix | openserver | unixware | beos | linux | freebsd | netbsd | solaris | hp-10 | hp-11 | os400 | irix | ptx | tru64 | macosx | cygwin | qnx)
+   aix | openserver | unixware | beos | linux | freebsd | netbsd | solaris | hp-10 | hp-11 | os400 | irix | ptx | tru64 | macosx | cygwin | qnx | openbsd)
        # platform has been recognized
        ;;
    *)
@@ -272,6 +272,9 @@
     elif test $platform = "freebsd"; then
         threadingLibs="-pthread -lc_r"
         threadingDefines="-D_THREAD_SAFE -DXML_USE_PTHREADS"
+    elif test $platform = "openbsd"; then
+        threadingLibs="-pthread"
+        threadingDefines="-D_THREAD_SAFE -DXML_USE_PTHREADS"
     elif test $platform = "netbsd"; then
         threadingLibs="-pthread"
         threadingDefines="-D_THREAD_SAFE -DXML_USE_PTHREADS"
@@ -354,7 +357,7 @@
 
 #
 #  aix | beos | linux | hp-11 | solaris |
-#  hp-10 | freebsd | netbsd | irix | openserver | unixware | os400 | ptx | tru64 | macosx
+#  hp-10 | freebsd | netbsd | irix | openserver | unixware | os400 | ptx | tru64 | macosx | openbsd
 #
 if test $bitsToBuild = 64; then
     bitstobuildDefines=" -DXML_BITSTOBUILD_64 "
@@ -396,6 +399,13 @@
 transcodingLibs=""       # by default don't suppose the libiconv is necessary
 transcodingDefines=""
 if test $platform = "freebsd"; then
+	testTranscoder="true";
+elif test $platform = "openbsd"; then
+	testTranscoder="true";
+else
+	testTranscoder="false"
+fi
+if test $testTranscoder = "true"; then
     if test -n "${XERCESCROOT}"; then
        # try lookup the configuration results
        . "${XERCESCROOT}/version.incl"