Modified: xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/PlatformUtils.hpp URL: http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/PlatformUtils.hpp?rev=178551&r1=178550&r2=178551&view=diff ============================================================================== --- xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/PlatformUtils.hpp (original) +++ xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/PlatformUtils.hpp Wed May 25 16:35:17 2005 @@ -22,9 +22,14 @@ #if !defined(PLATFORMUTILS_HPP) #define PLATFORMUTILS_HPP +#include <xercesc/util/XercesDefs.hpp> #include <xercesc/util/XMLException.hpp> #include <xercesc/util/PanicHandler.hpp> +#include <xercesc/util/XMLFileMgr.hpp> +#include <xercesc/util/XMLMutexMgr.hpp> +#include <xercesc/util/XMLAtomicOpMgr.hpp> + XERCES_CPP_NAMESPACE_BEGIN class XMLMsgLoader; @@ -123,6 +128,10 @@ */ static MemoryManager* fgArrayMemoryManager; + static XMLFileMgr* fgFileMgr; + static XMLMutexMgr* fgMutexMgr; + static XMLAtomicOpMgr* fgAtomicOpMgr; + static XMLMutex* fgAtomicMutex; //@} @@ -201,6 +210,13 @@ /** @name File Methods */ //@{ + /** Make a new file object appropriate for the platform. + * + * @param manager The MemoryManager to use to allocate objects + */ + static XMLFileMgr* + XMLPlatformUtils::makeFileMgr(MemoryManager* const manager); + /** Get the current file position * * This must be implemented by the per-platform driver, which should @@ -214,7 +230,7 @@ * @param theFile The file handle * @param manager The MemoryManager to use to allocate objects */ - static unsigned int curFilePos(FileHandle theFile + static XMLFilePos curFilePos(FileHandle theFile , MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager); /** Closes the file handle @@ -240,7 +256,7 @@ * @param manager The MemoryManager to use to allocate objects * @return Returns the size of the file in bytes */ - static unsigned int fileSize(FileHandle theFile + static XMLFilePos fileSize(FileHandle theFile , MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager); /** Opens the file @@ -323,10 +339,10 @@ * * @return Returns the number of bytes read from the stream or file */ - static unsigned int readFileBuffer + static XMLSize_t readFileBuffer ( FileHandle theFile - , const unsigned int toRead + , const XMLSize_t toRead , XMLByte* const toFill , MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager ); @@ -348,7 +364,7 @@ static void writeBufferToFile ( FileHandle const theFile - , long toWrite + , XMLSize_t toWrite , const XMLByte* const toFlush , MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager ); @@ -513,6 +529,15 @@ /** @name Mutex Methods */ //@{ + /** Factory method for creating MutexMgr object. + * + * This factory method creates a mutexmgr that will be used + * on the particular platform. + * + * @param manager The MemoryManager to use to allocate objects + */ + static XMLMutexMgr* makeMutexMgr(MemoryManager* const memmgr); + /** Closes a mutex handle * * Each per-platform driver must implement this. Only it knows what @@ -520,7 +545,7 @@ * * @param mtxHandle The mutex handle that you want to close */ - static void closeMutex(void* const mtxHandle); + static void closeMutex(void* const mtxHandle, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager); /** Locks a mutex handle * @@ -538,7 +563,7 @@ * handle pointer will be eventually passed to closeMutex() which is * also implemented by the platform driver. */ - static void* makeMutex(); + static void* makeMutex(MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager); /** Unlocks a mutex * @@ -573,6 +598,16 @@ /** @name Miscellaneous synchronization methods */ //@{ + + /** Factory method for creating MutexMgr object. + * + * This factory method creates an XMLAtomicOpMgr that will be used + * on the particular platform. + * + * @param manager The MemoryManager to use to allocate objects + */ + static XMLAtomicOpMgr* makeAtomicOpMgr(MemoryManager* const memmgr); + /** Conditionally updates or returns a single word variable atomically *
Modified: xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Platforms/MacOS/MacAbstractFile.hpp URL: http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Platforms/MacOS/MacAbstractFile.hpp?rev=178551&r1=178550&r2=178551&view=diff ============================================================================== --- xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Platforms/MacOS/MacAbstractFile.hpp (original) +++ xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Platforms/MacOS/MacAbstractFile.hpp Wed May 25 16:35:17 2005 @@ -24,20 +24,20 @@ XERCES_CPP_NAMESPACE_BEGIN -// Abstract class for files. This could be used to allow multiple file paradigms. -class XMLMacAbstractFile : public XMemory +// Abstract class for files. This is be used to allow multiple file handling implementations. +class XMLAbstractFile : public XMemory { public: XMLMacAbstractFile() {} virtual ~XMLMacAbstractFile() {} - virtual unsigned int currPos() = 0; + virtual unsigned long currPos() = 0; virtual void close() = 0; - virtual unsigned int size() = 0; + virtual unsigned long size() = 0; virtual bool open(const XMLCh* path, bool toWrite = false) = 0; virtual bool open(const char* path, bool toWrite = false) = 0; - virtual unsigned int read(unsigned int byteCount, XMLByte* buffer) = 0; - virtual void write(long byteCount, const XMLByte* buffer) = 0; + virtual unsigned long read(unsigned long byteCount, XMLByte* buffer) = 0; + virtual void write(unsigned long byteCount, const XMLByte* buffer) = 0; virtual void reset() = 0; }; Modified: xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.cpp URL: http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.cpp?rev=178551&r1=178550&r2=178551&view=diff ============================================================================== --- xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.cpp (original) +++ xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.cpp Wed May 25 16:35:17 2005 @@ -57,7 +57,6 @@ #include <xercesc/util/TranscodingException.hpp> #include <xercesc/util/PlatformUtils.hpp> #include <xercesc/util/Janitor.hpp> -#include <xercesc/util/Platforms/MacOS/MacOSPlatformUtils.hpp> XERCES_CPP_NAMESPACE_BEGIN @@ -308,7 +307,7 @@ // Since posix paths are utf-8 encoding on OS X, and the OS X // terminal uses utf-8 by default, this seems to make the most sense. #if !defined(XML_MACOS_LCP_TRADITIONAL) - if (gMacOSXOrBetter) + if (true /*gMacOSXOrBetter*/) { // Manufacture a text encoding for UTF8 encoding = CreateTextEncoding(kTextEncodingUnicodeDefault, Added: xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/XMLAtomicOpMgr.hpp URL: http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/XMLAtomicOpMgr.hpp?rev=178551&view=auto ============================================================================== --- xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/XMLAtomicOpMgr.hpp (added) +++ xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/XMLAtomicOpMgr.hpp Wed May 25 16:35:17 2005 @@ -0,0 +1,48 @@ + +/* + * Copyright 1999-2000,2004-2005 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$ + */ + +#ifndef XMLATOMICOPMGL_HPP +#define XMLATOMICOPMGL_HPP + +#include <xercesc/util/XMemory.hpp> + +XERCES_CPP_NAMESPACE_BEGIN + +// Abstract class for mutex implementation. +// This is be used to allow multiple mutex handling implementations. +class XMLAtomicOpMgr : public XMemory +{ + public: + XMLAtomicOpMgr() {} + virtual ~XMLAtomicOpMgr() {} + + // Atomic operations + virtual void* compareAndSwap(void** toFill + , const void* const newValue + , const void* const toCompare) = 0; + virtual int increment(int &location) = 0; + virtual int decrement(int &location) = 0; +}; + +XERCES_CPP_NAMESPACE_END + + +#endif \ No newline at end of file Added: xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/XMLFileMgr.hpp URL: http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/XMLFileMgr.hpp?rev=178551&view=auto ============================================================================== --- xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/XMLFileMgr.hpp (added) +++ xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/XMLFileMgr.hpp Wed May 25 16:35:17 2005 @@ -0,0 +1,61 @@ +/* + * 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. + */ + +/* + * $Id: MacAbstractFile.hpp 176026 2004-09-08 13:57:07Z peiyongz $ + */ + +#ifndef XMLFILEMGR_HPP +#define XMLFILEMGR_HPP + +#include <xercesc/util/XercesDefs.hpp> +#include <xercesc/util/XMemory.hpp> + +XERCES_CPP_NAMESPACE_BEGIN + +typedef void* FileHandle; +#define XERCES_Invalid_File_Handle 0 + +// Abstract class for files. This is be used to allow multiple file handling implementations. +class XMLFileMgr : public XMemory +{ + public: + XMLFileMgr() {} + virtual ~XMLFileMgr() {} + + // File access + virtual FileHandle open(const XMLCh* path, bool toWrite, MemoryManager* const manager) = 0; + virtual FileHandle open(const char* path, bool toWrite, MemoryManager* const manager) = 0; + virtual FileHandle openStdIn(MemoryManager* const manager) = 0; + + virtual void close(FileHandle f, MemoryManager* const manager) = 0; + virtual void reset(FileHandle f, MemoryManager* const manager) = 0; + + virtual XMLFilePos curPos(FileHandle f, MemoryManager* const manager) = 0; + virtual XMLFilePos size(FileHandle f, MemoryManager* const manager) = 0; + + virtual XMLSize_t read(FileHandle f, XMLSize_t byteCount, XMLByte* buffer, MemoryManager* const manager) = 0; + virtual void write(FileHandle f, XMLSize_t byteCount, const XMLByte* buffer, MemoryManager* const manager) = 0; + + // Ancillary path handling routines + virtual XMLCh* getFullPath(const XMLCh* const srcPath, MemoryManager* const manager) = 0; + virtual XMLCh* getCurrentDirectory(MemoryManager* const manager) = 0; + virtual bool isRelative(const XMLCh* const toCheck, MemoryManager* const manager) = 0; +}; + +XERCES_CPP_NAMESPACE_END + +#endif \ No newline at end of file Added: xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/XMLMutexMgr.hpp URL: http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/XMLMutexMgr.hpp?rev=178551&view=auto ============================================================================== --- xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/XMLMutexMgr.hpp (added) +++ xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/XMLMutexMgr.hpp Wed May 25 16:35:17 2005 @@ -0,0 +1,48 @@ +/* + * 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. + */ + +/* + * $Id: MacAbstractFile.hpp 176026 2004-09-08 13:57:07Z peiyongz $ + */ + +#ifndef XMLMUTEXMGL_HPP +#define XMLMUTEXMGL_HPP + +#include <xercesc/util/XMemory.hpp> + +XERCES_CPP_NAMESPACE_BEGIN + +typedef void* XMLMutexHandle; + +// Abstract class for mutex implementation. +// This is be used to allow multiple mutex handling implementations. +class XMLMutexMgr : public XMemory +{ + public: + XMLMutexMgr() {} + virtual ~XMLMutexMgr() {} + + // Mutex operations + virtual XMLMutexHandle create(MemoryManager* const manager) = 0; + virtual void destroy(XMLMutexHandle mtx, MemoryManager* const manager) = 0; + virtual void lock(XMLMutexHandle mtx) = 0; + virtual void unlock(XMLMutexHandle mtx) = 0; +}; + +XERCES_CPP_NAMESPACE_END + + +#endif Modified: xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/XMLString.cpp URL: http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/XMLString.cpp?rev=178551&r1=178550&r2=178551&view=diff ============================================================================== --- xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/XMLString.cpp (original) +++ xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/XMLString.cpp Wed May 25 16:35:17 2005 @@ -22,6 +22,15 @@ // --------------------------------------------------------------------------- // Includes // --------------------------------------------------------------------------- +#include <config.h> + +#if !HAVE_STRICMP +# include <lib/stricmp.h> +#endif +#if !HAVE_STRNICMP +# include <lib/strnicmp.h> +#endif + #include <string.h> #include <ctype.h> #include <stdlib.h> 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=178551&r1=178550&r2=178551&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 Wed May 25 16:35:17 2005 @@ -15,179 +15,7 @@ */ /* - * $Log$ - * Revision 1.20 2005/04/27 18:21:51 cargilld - * Fix for problem on Solaris where open may return 0 as a valid FileHandle. Check for -1 instead. - * - * Revision 1.19 2004/09/08 13:56:25 peiyongz - * Apache License Version 2.0 - * - * Revision 1.18 2004/02/24 22:57:28 peiyongz - * XercesDeprecatedDOMLib - * - * Revision 1.17 2004/02/17 15:56:50 neilg - * fix for bug 25035; much thanks to Abe Backus - * - * Revision 1.16 2004/02/04 13:26:44 amassari - * Added support for the Interix platform (Windows Services for Unix 3.5) - * - * Revision 1.15 2003/05/29 11:18:37 gareth - * Added macros in so we can determine whether to do things like iostream as opposed to iostream.h and whether to use std:: or not. - * - * Revision 1.14 2003/05/12 09:44:19 gareth - * Port to NetBSD. Patch by Hiramatsu Yoshifumi. - * - * Revision 1.13 2003/03/13 22:11:46 tng - * [Bug 17858] Support for QNX/Neutrino. Patch from Chris McKillop. - * - * Revision 1.12 2003/02/23 05:44:12 jberry - * Ripple through changes of BeOSDefs.h name change - * - * Revision 1.11 2002/12/31 19:31:07 tng - * [Bug 15590] BeOSDefs.hpp has wrong case in CVS. - * - * Revision 1.10 2002/12/02 20:40:49 tng - * [Bug 12490] Patches required to build Xerces-C++ on BeOS R5. Patch from Andrew Bachmann. - * - * Revision 1.9 2002/11/05 21:44:21 tng - * Do not code using namespace in a global header. - * - * Revision 1.8 2002/11/04 14:40:12 tng - * C++ Namespace Support. - * - * Revision 1.7 2002/07/12 16:48:49 jberry - * Remove reliance on XML_MACOSX. XML_MACOS is used solely. Where qualification - * by compiler is required, look for the compiler explicitly such as with - * XML_METROWERKS or __APPLE__ (for the Apple GCC compiler). - * - * Add a few tweaks for compatibility with GCC3.1. - * - * This change may address Bug 10649. - * - * Revision 1.6 2002/07/10 12:56:45 tng - * [Bug 9154] Requesting Xerces Version Macro. - * - * Revision 1.5 2002/05/21 19:35:08 tng - * Update from 1.7 to 2.0 - * - * Revision 1.4 2002/02/27 22:38:34 peiyongz - * Bug# 6445 Caldera (SCO) OpenServer Port : patch from Martin Kalen - * - * Revision 1.3 2002/02/20 21:41:54 tng - * project files changes for Xerces-C++ 1.7. - * - * Revision 1.2 2002/02/17 21:12:06 jberry - * Adjust "sane includes" include path for Mac OS. - * - * I've also changed this path for XML_AS400, XML_TRU64, XML_PTX_CC, and XML_DECCXX - * 'cause it looks like the right thing to do...hope that's not a mistake. - * - * Revision 1.1.1.1 2002/02/01 22:22:13 peiyongz - * sane_include - * - * Revision 1.18 2001/11/29 18:25:18 tng - * FreeBSD support by Michael Huedepohl. - * - * Revision 1.17 2001/11/23 17:19:33 tng - * Change from 1.5.2 to 1.6.0 - * - * Revision 1.16 2001/10/15 16:27:35 tng - * Changes for Xerces-C 1.5.2 - * - * Revision 1.15 2001/07/13 20:16:38 tng - * Update for release 1.5.1. - * - * Revision 1.14 2001/06/05 13:52:25 tng - * Change Version number from Xerces 1.4 to 1.5. By Pei Yong Zhang. - * - * Revision 1.13 2001/05/11 13:26:32 tng - * Copyright update. - * - * Revision 1.12 2001/02/08 14:15:33 tng - * enable COMPAQ Tru64 UNIX machines to build xerces-c with gcc (tested using COMPAQ gcc version2.95.2 19991024 (release) and Tru64 V5.0 1094). Added by Martin Kalen. - * - * Revision 1.11 2001/01/25 19:17:06 tng - * const should be used instead of static const. Fixed by Khaled Noaman. - * - * Revision 1.10 2001/01/12 22:09:07 tng - * Various update for Xerces 1.4 - * - * Revision 1.9 2000/11/07 18:14:39 andyh - * Fix incorrect version number in gXercesMinVersion. - * From Pieter Van-Dyck - * - * Revision 1.8 2000/11/02 07:23:27 roddey - * Just a test of checkin access - * - * Revision 1.7 2000/08/18 21:29:14 andyh - * Change version to 1.3 in preparation for upcoming Xerces 1.3 - * and XML4C 3.3 stable releases - * - * Revision 1.6 2000/08/07 20:31:34 jpolast - * include SAX2_EXPORT module - * - * Revision 1.5 2000/08/01 18:26:02 aruna1 - * Tru64 support added - * - * Revision 1.4 2000/07/29 05:36:37 jberry - * Fix misspelling in Mac OS port - * - * Revision 1.3 2000/07/19 18:20:12 andyh - * Macintosh port: fix problems with yesterday's code checkin. A couple - * of the changes were mangled or missed. - * - * Revision 1.2 2000/04/04 20:11:29 abagchi - * Added PTX support - * - * Revision 1.1 2000/03/02 19:54:50 roddey - * This checkin includes many changes done while waiting for the - * 1.1.0 code to be finished. I can't list them all here, but a list is - * available elsewhere. - * - * Revision 1.13 2000/03/02 01:51:00 aruna1 - * Sun CC 5.0 related changes - * - * Revision 1.12 2000/02/24 20:05:26 abagchi - * Swat for removing Log from API docs - * - * Revision 1.11 2000/02/22 01:00:10 aruna1 - * GNUGDefs references removed. Now only GCCDefs is used instead - * - * Revision 1.10 2000/02/06 07:48:05 rahulj - * Year 2K copyright swat. - * - * Revision 1.9 2000/02/01 23:43:32 abagchi - * AS/400 related change - * - * Revision 1.8 2000/01/21 22:12:29 abagchi - * OS390 Change: changed OE390 to OS390 - * - * Revision 1.7 2000/01/14 01:18:35 roddey - * Added a macro, XMLStrL(), which is defined one way or another according - * to whether the per-compiler file defines XML_LSTRSUPPORT or not. This - * allows conditional support of L"" type prefixes. - * - * Revision 1.6 2000/01/14 00:52:06 roddey - * Updated the version information for the next release, i.e. 1.1.0 - * - * Revision 1.5 1999/12/17 01:28:53 rahulj - * Merged in changes submitted for UnixWare 7 port. Platform - * specific files are still missing. - * - * Revision 1.4 1999/12/16 23:47:10 rahulj - * Updated for version 1.0.1 - * - * Revision 1.3 1999/12/01 17:16:16 rahulj - * Added support for IRIX 6.5.5 using SGI MIPSpro C++ 7.3 and 7.21 generating 32 bit objects. Changes submitted by Marc Stuessel - * - * Revision 1.2 1999/11/10 02:02:51 abagchi - * Changed version numbers - * - * Revision 1.1.1.1 1999/11/09 01:05:35 twl - * Initial checkin - * - * Revision 1.3 1999/11/08 20:45:19 rahul - * Swat for adding in Product name and CVS comment log variable. + * $Id$ * */ @@ -195,6 +23,8 @@ #if !defined(XERCESDEFS_HPP) #define XERCESDEFS_HPP +#include <x_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 @@ -202,14 +32,15 @@ #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> -#define XERCES_Invalid_File_Handle 0 - // --------------------------------------------------------------------------- // According to the platform we include a platform specific file. This guy // will set up any platform specific stuff, such as character mode. @@ -371,6 +202,12 @@ #include <xercesc/util/Compilers/QCCDefs.hpp> #endif + +#endif + + + + // --------------------------------------------------------------------------- // Some general typedefs that are defined for internal flexibility. // @@ -453,51 +290,51 @@ // include above. // --------------------------------------------------------------------------- #if defined(PROJ_XMLUTIL) -#define XMLUTIL_EXPORT PLATFORM_EXPORT +#define XMLUTIL_EXPORT XERCES_PLATFORM_EXPORT #else -#define XMLUTIL_EXPORT PLATFORM_IMPORT +#define XMLUTIL_EXPORT XERCES_PLATFORM_IMPORT #endif #if defined(PROJ_XMLPARSER) -#define XMLPARSER_EXPORT PLATFORM_EXPORT +#define XMLPARSER_EXPORT XERCES_PLATFORM_EXPORT #else -#define XMLPARSER_EXPORT PLATFORM_IMPORT +#define XMLPARSER_EXPORT XERCES_PLATFORM_IMPORT #endif #if defined(PROJ_SAX4C) -#define SAX_EXPORT PLATFORM_EXPORT +#define SAX_EXPORT XERCES_PLATFORM_EXPORT #else -#define SAX_EXPORT PLATFORM_IMPORT +#define SAX_EXPORT XERCES_PLATFORM_IMPORT #endif #if defined(PROJ_SAX2) -#define SAX2_EXPORT PLATFORM_EXPORT +#define SAX2_EXPORT XERCES_PLATFORM_EXPORT #else -#define SAX2_EXPORT PLATFORM_IMPORT +#define SAX2_EXPORT XERCES_PLATFORM_IMPORT #endif #if defined(PROJ_DOM) -#define CDOM_EXPORT PLATFORM_EXPORT +#define CDOM_EXPORT XERCES_PLATFORM_EXPORT #else -#define CDOM_EXPORT PLATFORM_IMPORT +#define CDOM_EXPORT XERCES_PLATFORM_IMPORT #endif #if defined(PROJ_DEPRECATED_DOM) -#define DEPRECATED_DOM_EXPORT PLATFORM_EXPORT +#define DEPRECATED_DOM_EXPORT XERCES_PLATFORM_EXPORT #else -#define DEPRECATED_DOM_EXPORT PLATFORM_IMPORT +#define DEPRECATED_DOM_EXPORT XERCES_PLATFORM_IMPORT #endif #if defined(PROJ_PARSERS) -#define PARSERS_EXPORT PLATFORM_EXPORT +#define PARSERS_EXPORT XERCES_PLATFORM_EXPORT #else -#define PARSERS_EXPORT PLATFORM_IMPORT +#define PARSERS_EXPORT XERCES_PLATFORM_IMPORT #endif #if defined(PROJ_VALIDATORS) -#define VALIDATORS_EXPORT PLATFORM_EXPORT +#define VALIDATORS_EXPORT XERCES_PLATFORM_EXPORT #else -#define VALIDATORS_EXPORT PLATFORM_IMPORT +#define VALIDATORS_EXPORT XERCES_PLATFORM_IMPORT #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=178551&r1=178550&r2=178551&view=diff ============================================================================== --- xerces/c/branches/jberry/3.0-unstable/tests/Makefile.in (original) +++ xerces/c/branches/jberry/3.0-unstable/tests/Makefile.in Wed May 25 16:35:17 2005 @@ -59,19 +59,21 @@ host_triplet = @host@ check_PROGRAMS = $(am__EXEEXT_1) subdir = tests -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in config.guess \ - config.sub install-sh +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/cxx_have_bool.m4 \ $(top_srcdir)/m4/cxx_have_lstring.m4 \ $(top_srcdir)/m4/cxx_have_namespaces.m4 \ $(top_srcdir)/m4/cxx_have_std_libs.m4 \ $(top_srcdir)/m4/cxx_have_std_namespace.m4 \ + $(top_srcdir)/m4/xerces_atomicopmgr_selection.m4 \ $(top_srcdir)/m4/xerces_curl_prefix.m4 \ + $(top_srcdir)/m4/xerces_filemgr_selection.m4 \ $(top_srcdir)/m4/xerces_icu_prefix.m4 \ $(top_srcdir)/m4/xerces_libwww_prefix.m4 \ $(top_srcdir)/m4/xerces_link_darwin_framework.m4 \ $(top_srcdir)/m4/xerces_msgloader_selection.m4 \ + $(top_srcdir)/m4/xerces_mutexmgr_selection.m4 \ $(top_srcdir)/m4/xerces_netaccessor_selection.m4 \ $(top_srcdir)/m4/xerces_transcoder_selection.m4 \ $(top_srcdir)/m4/xerces_type_16bit_int.m4 \ @@ -232,6 +234,12 @@ XERCES_USE_NETACCESSOR_SOCKET_TRUE = @XERCES_USE_NETACCESSOR_SOCKET_TRUE@ XERCES_USE_NETACCESSOR_WINSOCK_FALSE = @XERCES_USE_NETACCESSOR_WINSOCK_FALSE@ XERCES_USE_NETACCESSOR_WINSOCK_TRUE = @XERCES_USE_NETACCESSOR_WINSOCK_TRUE@ +XERCES_USE_POSIX_ATOMICOPMGR_FALSE = @XERCES_USE_POSIX_ATOMICOPMGR_FALSE@ +XERCES_USE_POSIX_ATOMICOPMGR_TRUE = @XERCES_USE_POSIX_ATOMICOPMGR_TRUE@ +XERCES_USE_POSIX_FILEMGR_FALSE = @XERCES_USE_POSIX_FILEMGR_FALSE@ +XERCES_USE_POSIX_FILEMGR_TRUE = @XERCES_USE_POSIX_FILEMGR_TRUE@ +XERCES_USE_POSIX_MUTEXMGR_FALSE = @XERCES_USE_POSIX_MUTEXMGR_FALSE@ +XERCES_USE_POSIX_MUTEXMGR_TRUE = @XERCES_USE_POSIX_MUTEXMGR_TRUE@ XERCES_USE_TRANSCODER_ICU_FALSE = @XERCES_USE_TRANSCODER_ICU_FALSE@ XERCES_USE_TRANSCODER_ICU_TRUE = @XERCES_USE_TRANSCODER_ICU_TRUE@ XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_FALSE = @XERCES_USE_TRANSCODER_MACOSUNICODECONVERTER_FALSE@ Modified: xerces/c/branches/jberry/3.0-unstable/x_config.h URL: http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/x_config.h?rev=178551&r1=178550&r2=178551&view=diff ============================================================================== --- xerces/c/branches/jberry/3.0-unstable/x_config.h (original) +++ xerces/c/branches/jberry/3.0-unstable/x_config.h Wed May 25 16:35:17 2005 @@ -6,7 +6,7 @@ // // There are two primary xerces configuration header files: // -// xerces_hdr_config.h -- For configuration of items that must be accessable +// x_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. // @@ -21,14 +21,18 @@ // is used out of the box. // +#ifndef X_CONFIG_HPP +#define X_CONFIG_HPP + // --------------------------------------------------------------------------- // 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 unsigned short +#define XERCES_XMLCH_T unsigned short #define XERCES_SIZE_T size_t #define XERCES_SSIZE_T ssize_t @@ -40,27 +44,44 @@ #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 defined(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 XMLCh; +typedef XERCES_XMLCH_T XMLCh; // --------------------------------------------------------------------------- -// Define unsigned 16 and 32 bits integers +// Define unsigned 16 and 32 bit integers // --------------------------------------------------------------------------- typedef unsigned XERCES_16BIT_INT XMLUInt16; typedef unsigned XERCES_32BIT_INT XMLUInt32; // --------------------------------------------------------------------------- -// Define signed 32 bits integers +// Define signed 32 bit integers // --------------------------------------------------------------------------- typedef XERCES_32BIT_INT XMLInt32; // --------------------------------------------------------------------------- -// XMLSize_t is the unsigned integral type. +// XMLFilePos is the type used to represent a file position. // --------------------------------------------------------------------------- -typedef XERCES_SIZE_T XMLSize_t; -typedef XERCES_SSIZE_T XMLSSize_t; +// *** TODO: shouldn't hardcode this. +typedef unsigned long XMLFilePos; + // --------------------------------------------------------------------------- @@ -68,4 +89,7 @@ // --------------------------------------------------------------------------- #if defined(_DEBUG) #define XERCES_DEBUG +#endif + + #endif Modified: xerces/c/branches/jberry/3.0-unstable/x_config.h.in URL: http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/x_config.h.in?rev=178551&r1=178550&r2=178551&view=diff ============================================================================== --- xerces/c/branches/jberry/3.0-unstable/x_config.h.in (original) +++ xerces/c/branches/jberry/3.0-unstable/x_config.h.in Wed May 25 16:35:17 2005 @@ -5,7 +5,7 @@ // // There are two primary xerces configuration header files: // -// xerces_hdr_config.h -- For configuration of items that must be accessable +// x_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. // @@ -20,14 +20,18 @@ // is used out of the box. // +#ifndef X_CONFIG_HPP +#define X_CONFIG_HPP + // --------------------------------------------------------------------------- // 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 +#undef XERCES_XMLCH_T #undef XERCES_SIZE_T #undef XERCES_SSIZE_T @@ -39,27 +43,44 @@ #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 defined(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 XMLCh; +typedef XERCES_XMLCH_T XMLCh; // --------------------------------------------------------------------------- -// Define unsigned 16 and 32 bits integers +// Define unsigned 16 and 32 bit integers // --------------------------------------------------------------------------- typedef unsigned XERCES_16BIT_INT XMLUInt16; typedef unsigned XERCES_32BIT_INT XMLUInt32; // --------------------------------------------------------------------------- -// Define signed 32 bits integers +// Define signed 32 bit integers // --------------------------------------------------------------------------- typedef XERCES_32BIT_INT XMLInt32; // --------------------------------------------------------------------------- -// XMLSize_t is the unsigned integral type. +// XMLFilePos is the type used to represent a file position. // --------------------------------------------------------------------------- -typedef XERCES_SIZE_T XMLSize_t; -typedef XERCES_SSIZE_T XMLSSize_t; +// *** TODO: shouldn't hardcode this. +typedef unsigned long XMLFilePos; + // --------------------------------------------------------------------------- @@ -67,4 +88,7 @@ // --------------------------------------------------------------------------- #if defined(_DEBUG) #define XERCES_DEBUG +#endif + + #endif --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
