Author: jberry
Date: Thu May 26 22:02:43 2005
New Revision: 178746
URL: http://svn.apache.org/viewcvs?rev=178746&view=rev
Log:
Rename x_config.h as xerces_hdr_config.h. This is the file that carries
configuration information that's safe for exposure through public headers.
config.h, the main autoconf-generated config file has more data, but it
may clash with other packages the user is using, so we don't expose it
through Xerces headers.
Added:
xerces/c/branches/jberry/3.0-unstable/xerces_hdr_config.h
xerces/c/branches/jberry/3.0-unstable/xerces_hdr_config.h.in
Removed:
xerces/c/branches/jberry/3.0-unstable/x_config.h
xerces/c/branches/jberry/3.0-unstable/x_config.h.in
Modified:
xerces/c/branches/jberry/3.0-unstable/Makefile.in
xerces/c/branches/jberry/3.0-unstable/configure
xerces/c/branches/jberry/3.0-unstable/configure.ac
xerces/c/branches/jberry/3.0-unstable/lib/Makefile.in
xerces/c/branches/jberry/3.0-unstable/obj/Makefile.in
xerces/c/branches/jberry/3.0-unstable/src/Makefile.in
xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/XercesDefs.hpp
xerces/c/branches/jberry/3.0-unstable/tests/Makefile.in
Modified: xerces/c/branches/jberry/3.0-unstable/Makefile.in
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/Makefile.in?rev=178746&r1=178745&r2=178746&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/Makefile.in (original)
+++ xerces/c/branches/jberry/3.0-unstable/Makefile.in Thu May 26 22:02:43 2005
@@ -37,10 +37,10 @@
host_triplet = @host@
DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(srcdir)/x_config.h.in $(top_srcdir)/configure config/compile \
- config/config.guess config/config.sub config/depcomp \
- config/install-sh config/ltmain.sh config/missing \
- config/mkinstalldirs
+ $(srcdir)/xerces_hdr_config.h.in $(top_srcdir)/configure \
+ config/compile config/config.guess config/config.sub \
+ config/depcomp config/install-sh config/ltmain.sh \
+ config/missing config/mkinstalldirs
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
@@ -68,7 +68,7 @@
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno configure.status.lineno
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-CONFIG_HEADER = config.h x_config.h
+CONFIG_HEADER = config.h xerces_hdr_config.h
CONFIG_CLEAN_FILES =
SOURCES =
DIST_SOURCES =
@@ -229,7 +229,7 @@
target_alias = @target_alias@
SUBDIRS = lib src obj tests
ACLOCAL_AMFLAGS = -I m4
-all: config.h x_config.h
+all: config.h xerces_hdr_config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES:
@@ -281,18 +281,18 @@
rm -f stamp-h1
touch $@
-x_config.h: stamp-h2
+xerces_hdr_config.h: stamp-h2
@if test ! -f $@; then \
rm -f stamp-h2; \
$(MAKE) stamp-h2; \
else :; fi
-stamp-h2: $(srcdir)/x_config.h.in $(top_builddir)/config.status
+stamp-h2: $(srcdir)/xerces_hdr_config.h.in $(top_builddir)/config.status
@rm -f stamp-h2
- cd $(top_builddir) && $(SHELL) ./config.status x_config.h
+ cd $(top_builddir) && $(SHELL) ./config.status xerces_hdr_config.h
distclean-hdr:
- -rm -f config.h stamp-h1 x_config.h stamp-h2
+ -rm -f config.h stamp-h1 xerces_hdr_config.h stamp-h2
mostlyclean-libtool:
-rm -f *.lo
@@ -385,7 +385,7 @@
mkid -fID $$unique
tags: TAGS
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in x_config.h.in
$(TAGS_DEPENDENCIES) \
+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in xerces_hdr_config.h.in
$(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
@@ -402,7 +402,7 @@
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
- list='$(SOURCES) $(HEADERS) config.h.in x_config.h.in $(LISP)
$(TAGS_FILES)'; \
+ list='$(SOURCES) $(HEADERS) config.h.in xerces_hdr_config.h.in $(LISP)
$(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -414,11 +414,11 @@
$$tags $$unique; \
fi
ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in x_config.h.in
$(TAGS_DEPENDENCIES) \
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in
xerces_hdr_config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) config.h.in x_config.h.in $(LISP)
$(TAGS_FILES)'; \
+ list='$(SOURCES) $(HEADERS) config.h.in xerces_hdr_config.h.in $(LISP)
$(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -580,7 +580,7 @@
exit 1; } >&2
check-am: all-am
check: check-recursive
-all-am: Makefile config.h x_config.h
+all-am: Makefile config.h xerces_hdr_config.h
installdirs: installdirs-recursive
installdirs-am:
install: install-recursive
Modified: xerces/c/branches/jberry/3.0-unstable/configure
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/configure?rev=178746&r1=178745&r2=178746&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/configure (original)
+++ xerces/c/branches/jberry/3.0-unstable/configure Thu May 26 22:02:43 2005
@@ -1569,7 +1569,7 @@
{ (exit 1); exit 1; }; }
fi
- ac_config_headers="$ac_config_headers config.h x_config.h"
+ ac_config_headers="$ac_config_headers config.h
xerces_hdr_config.h"
ac_config_files="$ac_config_files Makefile lib/Makefile src/Makefile
obj/Makefile tests/Makefile"
@@ -26076,7 +26076,7 @@
"tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
"depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
- "x_config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS x_config.h" ;;
+ "xerces_hdr_config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS xerces_hdr_config.h"
;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
{ (exit 1); exit 1; }; };;
Modified: xerces/c/branches/jberry/3.0-unstable/configure.ac
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/configure.ac?rev=178746&r1=178745&r2=178746&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/configure.ac (original)
+++ xerces/c/branches/jberry/3.0-unstable/configure.ac Thu May 26 22:02:43 2005
@@ -28,7 +28,7 @@
AC_CONFIG_LIBOBJ_DIR([xercesc/compat])
AC_CONFIG_AUX_DIR([config])
AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_HEADERS([config.h x_config.h])
+AC_CONFIG_HEADERS([config.h xerces_hdr_config.h])
AC_CONFIG_FILES([Makefile lib/Makefile src/Makefile obj/Makefile
tests/Makefile])
# Check the target system
Modified: xerces/c/branches/jberry/3.0-unstable/lib/Makefile.in
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/lib/Makefile.in?rev=178746&r1=178745&r2=178746&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/lib/Makefile.in (original)
+++ xerces/c/branches/jberry/3.0-unstable/lib/Makefile.in Thu May 26 22:02:43
2005
@@ -85,7 +85,8 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/x_config.h
+CONFIG_HEADER = $(top_builddir)/config.h \
+ $(top_builddir)/xerces_hdr_config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
am__DEPENDENCIES_1 = @LTLIBOBJS@
Modified: xerces/c/branches/jberry/3.0-unstable/obj/Makefile.in
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/obj/Makefile.in?rev=178746&r1=178745&r2=178746&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/obj/Makefile.in (original)
+++ xerces/c/branches/jberry/3.0-unstable/obj/Makefile.in Thu May 26 22:02:43
2005
@@ -84,7 +84,8 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/x_config.h
+CONFIG_HEADER = $(top_builddir)/config.h \
+ $(top_builddir)/xerces_hdr_config.h
CONFIG_CLEAN_FILES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
Modified: xerces/c/branches/jberry/3.0-unstable/src/Makefile.in
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/src/Makefile.in?rev=178746&r1=178745&r2=178746&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/src/Makefile.in (original)
+++ xerces/c/branches/jberry/3.0-unstable/src/Makefile.in Thu May 26 22:02:43
2005
@@ -139,7 +139,8 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/x_config.h
+CONFIG_HEADER = $(top_builddir)/config.h \
+ $(top_builddir)/xerces_hdr_config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
libcfurl_la_LIBADD =
Modified: xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/XercesDefs.hpp
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/XercesDefs.hpp?rev=178746&r1=178745&r2=178746&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/XercesDefs.hpp
(original)
+++ xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/XercesDefs.hpp Thu
May 26 22:02:43 2005
@@ -23,189 +23,27 @@
#if !defined(XERCESDEFS_HPP)
#define XERCESDEFS_HPP
-#include <x_config.h>
+// ---------------------------------------------------------------------------
+// The file xerces_hdr_config defines critical configuration information
+// used by the remainder of this file.
+//
+// There are two major configuration files:
+// - xerces_hdr_config.h -- Contains defines that are
safe for
+//
access through public headers.
+//
+// - config.h -- Contains
defines that may conflict
+// with
other packages; should only be
+//
included by Xerces implementation files.
+//
+// Both of these files are generated through the autoconf/configure
process.
+// ---------------------------------------------------------------------------
+#include <xerces_hdr_config.h>
// ---------------------------------------------------------------------------
// Include the Xerces version information; this is kept in a separate file to
// make modification simple and obvious. Updates to the version header file
// ---------------------------------------------------------------------------
#include <xercesc/util/XercesVersion.hpp>
-
-
-#if 0
-
-
-// ---------------------------------------------------------------------------
-// Include the header that does automatic sensing of the current platform
-// and compiler.
-// ---------------------------------------------------------------------------
-#include <xercesc/util/AutoSense.hpp>
-
-// ---------------------------------------------------------------------------
-// According to the platform we include a platform specific file. This guy
-// will set up any platform specific stuff, such as character mode.
-// ---------------------------------------------------------------------------
-#if defined(XML_WIN32)
-#include <xercesc/util/Platforms/Win32/Win32Defs.hpp>
-#endif
-
-#if defined(XML_CYGWIN)
-#include <xercesc/util/Platforms/Cygwin/CygwinDefs.hpp>
-#endif
-
-#if defined(XML_AIX)
-#include <xercesc/util/Platforms/AIX/AIXDefs.hpp>
-#endif
-
-#if defined(XML_SOLARIS)
-#include <xercesc/util/Platforms/Solaris/SolarisDefs.hpp>
-#endif
-
-#if defined(XML_OPENSERVER)
-#include <xercesc/util/Platforms/OpenServer/OpenServerDefs.hpp>
-#endif
-
-#if defined(XML_UNIXWARE)
-#include <xercesc/util/Platforms/UnixWare/UnixWareDefs.hpp>
-#endif
-
-#if defined(XML_HPUX)
-#include <xercesc/util/Platforms/HPUX/HPUXDefs.hpp>
-#endif
-
-#if defined(XML_IRIX)
-#include <xercesc/util/Platforms/IRIX/IRIXDefs.hpp>
-#endif
-
-#if defined(XML_INTERIX)
-#include <xercesc/util/Platforms/Interix/InterixDefs.hpp>
-#endif
-
-#if defined(XML_TANDEM)
-#include <xercesc/util/Platforms/Tandem/TandemDefs.hpp>
-#endif
-
-#if defined(XML_BEOS)
-#include <xercesc/util/Platforms/BeOS/BeOSDefs.hpp>
-#endif
-
-#if defined(XML_LINUX)
-#include <xercesc/util/Platforms/Linux/LinuxDefs.hpp>
-#endif
-
-#if defined(XML_FREEBSD)
-#include <xercesc/util/Platforms/FreeBSD/FreeBSDDefs.hpp>
-#endif
-
-#if defined(XML_OS390)
-#include <xercesc/util/Platforms/OS390/OS390Defs.hpp>
-#endif
-
-#if defined(XML_PTX)
-#include <xercesc/util/Platforms/PTX/PTXDefs.hpp>
-#endif
-
-#if defined(XML_OS2)
-#include <xercesc/util/Platforms/OS2/OS2Defs.hpp>
-#endif
-
-#if defined(XML_MACOS)
-#include <xercesc/util/Platforms/MacOS/MacOSDefs.hpp>
-#endif
-
-#if defined(XML_AS400)
-#include <xercesc/util/Platforms/OS400/OS400Defs.hpp>
-#endif
-
-#if defined(XML_TRU64)
-#include <xercesc/util/Platforms/Tru64/Tru64Defs.hpp>
-#endif
-
-#if defined(XML_QNX)
-#include <xercesc/util/Platforms/QNX/QNXDefs.hpp>
-#endif
-
-// ---------------------------------------------------------------------------
-// And now we subinclude a header according to the development environment
-// we are on. This guy defines for each platform some basic stuff that is
-// specific to the development environment.
-// ---------------------------------------------------------------------------
-#if defined(XML_VISUALCPP)
-#include <xercesc/util/Compilers/VCPPDefs.hpp>
-#endif
-
-#if defined(XML_CSET)
-#include <xercesc/util/Compilers/CSetDefs.hpp>
-#endif
-
-#if defined(XML_BORLAND)
-#include <xercesc/util/Compilers/BorlandCDefs.hpp>
-#endif
-
-#if defined(XML_SUNCC) || defined(XML_SUNCC5)
-#include <xercesc/util/Compilers/SunCCDefs.hpp>
-#endif
-
-#if defined(XML_SCOCC)
-#include <xercesc/util/Compilers/SCOCCDefs.hpp>
-#endif
-
-#if defined(XML_SOLARIS_KAICC)
-#include <xercesc/util/Compilers/SunKaiDefs.hpp>
-#endif
-
-#if defined(XML_HPUX_CC) || defined(XML_HPUX_aCC) || defined(XML_HPUX_KAICC)
-#include <xercesc/util/Compilers/HPCCDefs.hpp>
-#endif
-
-#if defined(XML_MIPSPRO_CC)
-#include <xercesc/util/Compilers/MIPSproDefs.hpp>
-#endif
-
-#if defined(XML_TANDEMCC)
-#include <xercesc/util/Compilers/TandemCCDefs.hpp>
-#endif
-
-#if defined(XML_GCC)
-#include <xercesc/util/Compilers/GCCDefs.hpp>
-#endif
-
-#if defined(XML_MVSCPP)
-#include <xercesc/util/Compilers/MVSCPPDefs.hpp>
-#endif
-
-#if defined(XML_IBMVAW32)
-#include <xercesc/util/Compilers/IBMVAW32Defs.hpp>
-#endif
-
-#if defined(XML_IBMVAOS2)
-#include <xercesc/util/Compilers/IBMVAOS2Defs.hpp>
-#endif
-
-#if defined(XML_METROWERKS)
-#include <xercesc/util/Compilers/CodeWarriorDefs.hpp>
-#endif
-
-#if defined(XML_PTX_CC)
-#include <xercesc/util/Compilers/PTXCCDefs.hpp>
-#endif
-
-#if defined(XML_AS400)
-#include <xercesc/util/Compilers/OS400SetDefs.hpp>
-#endif
-
-#if defined(XML_DECCXX)
-#include <xercesc/util/Compilers/DECCXXDefs.hpp>
-#endif
-
-#if defined(XML_QCC)
-#include <xercesc/util/Compilers/QCCDefs.hpp>
-#endif
-
-
-#endif
-
-
// ---------------------------------------------------------------------------
Modified: xerces/c/branches/jberry/3.0-unstable/tests/Makefile.in
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/tests/Makefile.in?rev=178746&r1=178745&r2=178746&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/tests/Makefile.in (original)
+++ xerces/c/branches/jberry/3.0-unstable/tests/Makefile.in Thu May 26 22:02:43
2005
@@ -84,7 +84,8 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/x_config.h
+CONFIG_HEADER = $(top_builddir)/config.h \
+ $(top_builddir)/xerces_hdr_config.h
CONFIG_CLEAN_FILES =
am__EXEEXT_1 = _DOMTest$(EXEEXT) _DOMMemTest$(EXEEXT) \
_Normalizer$(EXEEXT) _RangeTest$(EXEEXT) _Traversal$(EXEEXT) \
Added: xerces/c/branches/jberry/3.0-unstable/xerces_hdr_config.h
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/xerces_hdr_config.h?rev=178746&view=auto
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/xerces_hdr_config.h (added)
+++ xerces/c/branches/jberry/3.0-unstable/xerces_hdr_config.h Thu May 26
22:02:43 2005
@@ -0,0 +1,135 @@
+/* xerces_hdr_config.h. Generated by configure. */
+/*
+ * Copyright 1999-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.
+ */
+
+/*
+ * $Id$
+ */
+
+//
+// There are two primary xerces configuration header files:
+//
+// xerces_hdr_config.h -- For configuration of items that
must be accessable
+// through public
headers. This file has limited information
+// and carefully
works to avoid collision of macro names, etc.
+//
+// config.h -- Generalized autoconf header
file, with much more
+// information,
used to supply configuration information
+// for use in
implementation files.
+//
+// For autoconf based builds, this header is configured from by the configure
+// script from the .in template file of the same name.
+//
+// For non-autoconf based builds, the default (non-template) copy of the file
+// is used out of the box.
+//
+
+#ifndef X_CONFIG_HPP
+#define X_CONFIG_HPP
+
+#if !HAVE_CONFIG_H
+// ===========================================================================
+// This section provides hooks for build environments where autoconf
+// is not used. At a minimum, these environments must supply the definitions
+// below.
+// ===========================================================================
+
+// *** TODO: this is an example/idea for how this should be done
+
+#if WINDOWS_IDE_BUILD
+ // Configuration for a build through Visual Studio
+ #include <..SOMEPATHTO../WindowsVisualStudioConfig.h>
+#elif MACOS_XCODE_BUILD
+ // Configuration for a build through XCode
+ #include <..SOMEPATHTO../MacsOSXCodeConfig.h>
+#else
+ #error This build must be configured through autoconf or by providing
+ #error specific instructions for a non-autoconf build.
+#endif
+
+#else
+// ===========================================================================
+// This section contains defines that are configured through autoconf.
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+// These defines are set by configure as appropriate for the platform.
+// ---------------------------------------------------------------------------
+#define XERCES_AUTOCONF 1
+#define XERCES_HAVE_SYS_TYPES_H 1
+
+#define XERCES_16BIT_INT short
+#define XERCES_32BIT_INT int
+#define XERCES_XMLCH_T unsigned short
+#define XERCES_SIZE_T size_t
+#define XERCES_SSIZE_T ssize_t
+
+#define XERCES_STD_NAMESPACE 1
+#define XERCES_NEW_IOSTREAMS 1
+
+#if !defined(XERCES_STATIC_LIBRARY)
+#define XERCES_PLATFORM_EXPORT
+#define XERCES_PLATFORM_IMPORT
+#endif
+
+
+// ---------------------------------------------------------------------------
+// Must include sys/types.h if we're going to typedef to size_t below,
+// so include sys/types.h if it's available.
+// ---------------------------------------------------------------------------
+#if XERCES_HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+
+
+// ---------------------------------------------------------------------------
+// XMLSize_t is the unsigned integral type.
+// ---------------------------------------------------------------------------
+typedef XERCES_SIZE_T XMLSize_t;
+typedef XERCES_SSIZE_T XMLSSize_t;
+
+// ---------------------------------------------------------------------------
+// Define our version of the XML character
+// ---------------------------------------------------------------------------
+typedef XERCES_XMLCH_T XMLCh;
+
+// ---------------------------------------------------------------------------
+// Define unsigned 16 and 32 bit integers
+// ---------------------------------------------------------------------------
+typedef unsigned XERCES_16BIT_INT XMLUInt16;
+typedef unsigned XERCES_32BIT_INT XMLUInt32;
+
+// ---------------------------------------------------------------------------
+// Define signed 32 bit integers
+// ---------------------------------------------------------------------------
+typedef XERCES_32BIT_INT XMLInt32;
+
+// ---------------------------------------------------------------------------
+// XMLFilePos is the type used to represent a file position.
+// ---------------------------------------------------------------------------
+typedef unsigned XERCES_32BIT_INT XMLFilePos;
+
+
+
+// ---------------------------------------------------------------------------
+// Force on the Xerces debug token if it is on in the build environment
+// ---------------------------------------------------------------------------
+#if defined(_DEBUG)
+#define XERCES_DEBUG
+#endif
+
+#endif
+#endif
Added: xerces/c/branches/jberry/3.0-unstable/xerces_hdr_config.h.in
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/xerces_hdr_config.h.in?rev=178746&view=auto
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/xerces_hdr_config.h.in (added)
+++ xerces/c/branches/jberry/3.0-unstable/xerces_hdr_config.h.in Thu May 26
22:02:43 2005
@@ -0,0 +1,134 @@
+/*
+ * Copyright 1999-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.
+ */
+
+/*
+ * $Id$
+ */
+
+//
+// There are two primary xerces configuration header files:
+//
+// xerces_hdr_config.h -- For configuration of items that
must be accessable
+// through public
headers. This file has limited information
+// and carefully
works to avoid collision of macro names, etc.
+//
+// config.h -- Generalized autoconf header
file, with much more
+// information,
used to supply configuration information
+// for use in
implementation files.
+//
+// For autoconf based builds, this header is configured from by the configure
+// script from the .in template file of the same name.
+//
+// For non-autoconf based builds, the default (non-template) copy of the file
+// is used out of the box.
+//
+
+#ifndef X_CONFIG_HPP
+#define X_CONFIG_HPP
+
+#if !HAVE_CONFIG_H
+// ===========================================================================
+// This section provides hooks for build environments where autoconf
+// is not used. At a minimum, these environments must supply the definitions
+// below.
+// ===========================================================================
+
+// *** TODO: this is an example/idea for how this should be done
+
+#if WINDOWS_IDE_BUILD
+ // Configuration for a build through Visual Studio
+ #include <..SOMEPATHTO../WindowsVisualStudioConfig.h>
+#elif MACOS_XCODE_BUILD
+ // Configuration for a build through XCode
+ #include <..SOMEPATHTO../MacsOSXCodeConfig.h>
+#else
+ #error This build must be configured through autoconf or by providing
+ #error specific instructions for a non-autoconf build.
+#endif
+
+#else
+// ===========================================================================
+// This section contains defines that are configured through autoconf.
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+// These defines are set by configure as appropriate for the platform.
+// ---------------------------------------------------------------------------
+#undef XERCES_AUTOCONF
+#undef XERCES_HAVE_SYS_TYPES_H
+
+#undef XERCES_16BIT_INT
+#undef XERCES_32BIT_INT
+#undef XERCES_XMLCH_T
+#undef XERCES_SIZE_T
+#undef XERCES_SSIZE_T
+
+#undef XERCES_STD_NAMESPACE
+#undef XERCES_NEW_IOSTREAMS
+
+#if !defined(XERCES_STATIC_LIBRARY)
+#undef XERCES_PLATFORM_EXPORT
+#undef XERCES_PLATFORM_IMPORT
+#endif
+
+
+// ---------------------------------------------------------------------------
+// Must include sys/types.h if we're going to typedef to size_t below,
+// so include sys/types.h if it's available.
+// ---------------------------------------------------------------------------
+#if XERCES_HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+
+
+// ---------------------------------------------------------------------------
+// XMLSize_t is the unsigned integral type.
+// ---------------------------------------------------------------------------
+typedef XERCES_SIZE_T XMLSize_t;
+typedef XERCES_SSIZE_T XMLSSize_t;
+
+// ---------------------------------------------------------------------------
+// Define our version of the XML character
+// ---------------------------------------------------------------------------
+typedef XERCES_XMLCH_T XMLCh;
+
+// ---------------------------------------------------------------------------
+// Define unsigned 16 and 32 bit integers
+// ---------------------------------------------------------------------------
+typedef unsigned XERCES_16BIT_INT XMLUInt16;
+typedef unsigned XERCES_32BIT_INT XMLUInt32;
+
+// ---------------------------------------------------------------------------
+// Define signed 32 bit integers
+// ---------------------------------------------------------------------------
+typedef XERCES_32BIT_INT XMLInt32;
+
+// ---------------------------------------------------------------------------
+// XMLFilePos is the type used to represent a file position.
+// ---------------------------------------------------------------------------
+typedef unsigned XERCES_32BIT_INT XMLFilePos;
+
+
+
+// ---------------------------------------------------------------------------
+// Force on the Xerces debug token if it is on in the build environment
+// ---------------------------------------------------------------------------
+#if defined(_DEBUG)
+#define XERCES_DEBUG
+#endif
+
+#endif
+#endif
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
