Tinny and the Xerces team: The attached file makes it a little easier for BCB4 users to build the library. The change recognizes the fact that BCB4 can use wchar_t.
diff -r1.9 BorlandCDefs.hpp 105c105 < #if (__BORLANDC__ < 0x550) --- > #if (__BORLANDC__ < 0x540) 109c109 < #endif (__BORLANDC__ < 0x550) --- > #endif (__BORLANDC__ < 0x540) Please commit it to the source tree. Thanks, Don
/* * The Apache Software License, Version 1.1 * * Copyright (c) 1999-2000 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\@apache.org. * * 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) 1999, International * Business Machines, Inc., http://www.ibm.com . For more information * on the Apache Software Foundation, please see * <http://www.apache.org/>. */ /* * $Id: BorlandCDefs.hpp,v 1.9 2001/08/22 20:44:47 peiyongz Exp $ */ // --------------------------------------------------------------------------- // The following values represent various compiler version levels stored in // the precompiler macro __BORLANDC__, along with the associated C++Builder // IDE and compiler versions. // // __BORLANDC__ IDE Compiler // ------------ -------------- ------------------ // 0x510 BCB1 Borland C++ 5.1 // 0x530 BCB3 Borland C++ 5.3 // 0x540 BCB4 Borland C++ 5.4 // 0x550 BCB5 Borland C++ 5.5 // 0x551 BCB5 (patch 1) Borland C++ 5.5.1 // // Thus, a single copy of this file may be used to define a build environment // for any Borland C++Builder compiler. // --------------------------------------------------------------------------- // --------------------------------------------------------------------------- // A define in the build for each project is also used to control whether // the export keyword is from the project's viewpoint or the client's. // These defines provide the platform specific keywords that they need // to do this. // --------------------------------------------------------------------------- #define PLATFORM_EXPORT __declspec(dllexport) #define PLATFORM_IMPORT __declspec(dllimport) // --------------------------------------------------------------------------- // Indicate that we support native bools // --------------------------------------------------------------------------- // #define NO_NATIVE_BOOL // --------------------------------------------------------------------------- // We support L prefixed wide character constants // --------------------------------------------------------------------------- #define XML_LSTRSUPPORT // --------------------------------------------------------------------------- // Define our version of the XML character // --------------------------------------------------------------------------- #if (__BORLANDC__ < 0x540) typedef unsigned short XMLCh; #else typedef wchar_t XMLCh; #endif (__BORLANDC__ < 0x540) // --------------------------------------------------------------------------- // Define our version of a strict UTF16 character // --------------------------------------------------------------------------- typedef unsigned short UTF16Ch; // --------------------------------------------------------------------------- // Define unsigned 16 and 32 bits integers // --------------------------------------------------------------------------- typedef unsigned short XMLUInt16; typedef unsigned int XMLUInt32; // --------------------------------------------------------------------------- // Define signed 32 bits integers // --------------------------------------------------------------------------- typedef int XMLInt32; //WLH-2000-08-18 -- Add more compiler quirk cross-defines #define _itoa std::itoa // --------------------------------------------------------------------------- // Force on the Xerces debug token if it was on in the build environment // --------------------------------------------------------------------------- #ifdef _DEBUG #define XERCES_DEBUG #endif // --------------------------------------------------------------------------- // The name of the DLL as built by the Borland projects. At this time, it // does not use the versioning stuff. // --------------------------------------------------------------------------- const char* const Xerces_DLLName = "XercesLib";
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
