You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by tn...@apache.org on 2002/05/21 21:45:54 UTC
cvs commit: xml-xerces/c/src/xercesc/util/Compilers BorlandCDefs.hpp CodeWarriorDefs.hpp CSetDefs.hpp DECCXXDefs.hpp GCCDefs.hpp HPCCDefs.hpp IBMVAOS2Defs.hpp IBMVAW32Defs.hpp MIPSproDefs.hpp MVSCPPDefs.hpp OS400SetDefs.hpp PTXCCDefs.hpp SCOCCDefs.hpp SunCCDefs.hpp SunKaiDefs.hpp TandemCCDefs.hpp VCPPDefs.hpp
tng 02/05/21 12:45:54
Modified: c/src/xercesc/util/Compilers BorlandCDefs.hpp
CodeWarriorDefs.hpp CSetDefs.hpp DECCXXDefs.hpp
GCCDefs.hpp HPCCDefs.hpp IBMVAOS2Defs.hpp
IBMVAW32Defs.hpp MIPSproDefs.hpp MVSCPPDefs.hpp
OS400SetDefs.hpp PTXCCDefs.hpp SCOCCDefs.hpp
SunCCDefs.hpp SunKaiDefs.hpp TandemCCDefs.hpp
VCPPDefs.hpp
Log:
Define DOMSize_t and XMLSize_t
Revision Changes Path
1.2 +23 -10 xml-xerces/c/src/xercesc/util/Compilers/BorlandCDefs.hpp
Index: BorlandCDefs.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/Compilers/BorlandCDefs.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BorlandCDefs.hpp 1 Feb 2002 22:22:18 -0000 1.1
+++ BorlandCDefs.hpp 21 May 2002 19:45:53 -0000 1.2
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -55,9 +55,12 @@
*/
/*
- * $Id: BorlandCDefs.hpp,v 1.1 2002/02/01 22:22:18 peiyongz Exp $
+ * $Id: BorlandCDefs.hpp,v 1.2 2002/05/21 19:45:53 tng Exp $
*/
+#if !defined(BORLANDCDEFS_HPP)
+#define BORLANDCDEFS_HPP
+
// ---------------------------------------------------------------------------
// The following values represent various compiler version levels stored in
@@ -88,13 +91,17 @@
// ---------------------------------------------------------------------------
-// Indicate that we support native bools
+// Indicate that we do not support native bools
+// If the compiler can handle boolean itself, do not define it
// ---------------------------------------------------------------------------
// #define NO_NATIVE_BOOL
// ---------------------------------------------------------------------------
-// We support L prefixed wide character constants
+// Each compiler might support L"" prefixed constants. There are places
+// where it is advantageous to use the L"" where it supported, to avoid
+// unnecessary transcoding.
+// If your compiler does not support it, don't define this.
// ---------------------------------------------------------------------------
#define XML_LSTRSUPPORT
@@ -109,12 +116,6 @@
#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;
@@ -125,6 +126,17 @@
// ---------------------------------------------------------------------------
typedef int XMLInt32;
+// ---------------------------------------------------------------------------
+// XMLSize_t and DOMSize_t are the unsigned integral type.
+// ---------------------------------------------------------------------------
+#ifdef _SIZE_T
+typedef size_t XMLSize_t;
+#else
+typedef unsigned long XMLSize_t;
+#endif
+typedef XMLSize_t DOMSize_t;
+
+
//WLH-2000-08-18 -- Add more compiler quirk cross-defines
#define _itoa std::itoa
@@ -143,3 +155,4 @@
// ---------------------------------------------------------------------------
const char* const Xerces_DLLName = "XercesLib";
+#endif //BORLANDCDEFS_HPP
1.2 +27 -13 xml-xerces/c/src/xercesc/util/Compilers/CodeWarriorDefs.hpp
Index: CodeWarriorDefs.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/Compilers/CodeWarriorDefs.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CodeWarriorDefs.hpp 1 Feb 2002 22:22:18 -0000 1.1
+++ CodeWarriorDefs.hpp 21 May 2002 19:45:53 -0000 1.2
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -55,19 +55,11 @@
*/
/*
- * $Id: CodeWarriorDefs.hpp,v 1.1 2002/02/01 22:22:18 peiyongz Exp $
+ * $Id: CodeWarriorDefs.hpp,v 1.2 2002/05/21 19:45:53 tng Exp $
*/
-
-// ---------------------------------------------------------------------------
-// NOTE:
-//
-// Xerces is not officially supported on Macintosh. This file was sent
-// in by one of the Macintosh users and is included in the distribution
-// just for convenience. Please send any defects / modification
-// reports to xml4c@us.ibm.com
-// ---------------------------------------------------------------------------
-
+#if !defined(CODEWARRIORDEFS_HPP)
+#define CODEWARRIORDEFS_HPP
// ---------------------------------------------------------------------------
@@ -81,12 +73,22 @@
// ---------------------------------------------------------------------------
-// Indicate that we support native bools
+// Indicate that we do not support native bools
+// If the compiler can handle boolean itself, do not define it
// ---------------------------------------------------------------------------
// #define NO_NATIVE_BOOL
// ---------------------------------------------------------------------------
+// Each compiler might support L"" prefixed constants. There are places
+// where it is advantageous to use the L"" where it supported, to avoid
+// unnecessary transcoding.
+// If your compiler does not support it, don't define this.
+// ---------------------------------------------------------------------------
+// #define XML_LSTRSUPPORT
+
+
+// ---------------------------------------------------------------------------
// Define our version of the XMLCh.
// ---------------------------------------------------------------------------
typedef unsigned short XMLCh;
@@ -105,6 +107,16 @@
typedef int XMLInt32;
// ---------------------------------------------------------------------------
+// XMLSize_t and DOMSize_t are the unsigned integral type.
+// ---------------------------------------------------------------------------
+#ifdef _SIZE_T
+typedef size_t XMLSize_t;
+#else
+typedef unsigned long XMLSize_t;
+#endif
+typedef XMLSize_t DOMSize_t;
+
+// ---------------------------------------------------------------------------
// Force on the Xerces debug token if it was on in the build environment
// ---------------------------------------------------------------------------
#ifdef _DEBUG
@@ -124,3 +136,5 @@
// file is included into.
// ---------------------------------------------------------------------------
const char* const Xerces_DLLName = "xerces-c" Xerces_DLLVersionStr;
+
+#endif //CODEWARRIORDEFS_HPP
1.2 +26 -12 xml-xerces/c/src/xercesc/util/Compilers/CSetDefs.hpp
Index: CSetDefs.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/Compilers/CSetDefs.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CSetDefs.hpp 1 Feb 2002 22:22:18 -0000 1.1
+++ CSetDefs.hpp 21 May 2002 19:45:53 -0000 1.2
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,8 +56,11 @@
/*
* $Log: CSetDefs.hpp,v $
- * Revision 1.1 2002/02/01 22:22:18 peiyongz
- * Initial revision
+ * Revision 1.2 2002/05/21 19:45:53 tng
+ * Define DOMSize_t and XMLSize_t
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:18 peiyongz
+ * sane_include
*
* Revision 1.11 2001/03/02 20:52:54 knoaman
* Schema: Regular expression - misc. updates for error messages,
@@ -107,15 +110,8 @@
#define PLATFORM_IMPORT
// ---------------------------------------------------------------------------
-// Supports L"" prefixed constants. There are places
-// where it is advantageous to use the L"" where it supported, to avoid
-// unnecessary transcoding. xlC_r does support this, so we define this token.
-// If your compiler does not support it, don't define this.
-// ---------------------------------------------------------------------------
-#define XML_LSTRSUPPORT
-
-// ---------------------------------------------------------------------------
-// Indicate that we do not support native bools
+// Indicate that we do not support native bools
+// If the compiler can handle boolean itself, do not define it
// ---------------------------------------------------------------------------
#if !defined(__BOOL__)
#define NO_NATIVE_BOOL
@@ -123,9 +119,17 @@
// ---------------------------------------------------------------------------
+// Each compiler might support L"" prefixed constants. There are places
+// where it is advantageous to use the L"" where it supported, to avoid
+// unnecessary transcoding.
+// If your compiler does not support it, don't define this.
+// ---------------------------------------------------------------------------
+#define XML_LSTRSUPPORT
+
+
+// ---------------------------------------------------------------------------
// Define our version of the XML character
// ---------------------------------------------------------------------------
-//typedef unsigned short XMLCh;
typedef unsigned short XMLCh;
// ---------------------------------------------------------------------------
@@ -140,9 +144,19 @@
typedef int XMLInt32;
// ---------------------------------------------------------------------------
+// XMLSize_t and DOMSize_t are the unsigned integral type.
+// ---------------------------------------------------------------------------
+#ifdef _SIZE_T
+typedef size_t XMLSize_t;
+#else
+typedef unsigned long XMLSize_t;
+#endif
+typedef XMLSize_t DOMSize_t;
+
+// ---------------------------------------------------------------------------
// Force on the Xerces debug token if it was on in the build environment
// ---------------------------------------------------------------------------
-#if 0
+#if defined(_DEBUG)
#define XERCES_DEBUG
#endif
1.2 +45 -18 xml-xerces/c/src/xercesc/util/Compilers/DECCXXDefs.hpp
Index: DECCXXDefs.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/Compilers/DECCXXDefs.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DECCXXDefs.hpp 1 Feb 2002 22:22:18 -0000 1.1
+++ DECCXXDefs.hpp 21 May 2002 19:45:53 -0000 1.2
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2002 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.
- *
+ * 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:
+ * 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
+ * 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
@@ -45,7 +45,7 @@
* 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
@@ -55,7 +55,7 @@
*/
/*
- * $Id: DECCXXDefs.hpp,v 1.1 2002/02/01 22:22:18 peiyongz Exp $
+ * $Id: DECCXXDefs.hpp,v 1.2 2002/05/21 19:45:53 tng Exp $
*/
#if !defined(DECCXXDEFS_HPP)
@@ -68,6 +68,22 @@
#define PLATFORM_IMPORT
// ---------------------------------------------------------------------------
+// Indicate that we do not support native bools
+// If the compiler can handle boolean itself, do not define it
+// ---------------------------------------------------------------------------
+// #define NO_NATIVE_BOOL
+
+
+// ---------------------------------------------------------------------------
+// Each compiler might support L"" prefixed constants. There are places
+// where it is advantageous to use the L"" where it supported, to avoid
+// unnecessary transcoding.
+// If your compiler does not support it, don't define this.
+// ---------------------------------------------------------------------------
+// #define XML_LSTRSUPPORT
+
+
+// ---------------------------------------------------------------------------
// Define our version of the XML character
// ---------------------------------------------------------------------------
typedef unsigned short XMLCh;
@@ -84,12 +100,23 @@
typedef int XMLInt32;
// ---------------------------------------------------------------------------
-// Force on the XML4C debug token if it was on in the build environment
+// XMLSize_t and DOMSize_t are the unsigned integral type.
+// ---------------------------------------------------------------------------
+#ifdef _SIZE_T
+typedef size_t XMLSize_t;
+#else
+typedef unsigned long XMLSize_t;
+#endif
+typedef XMLSize_t DOMSize_t;
+
+// ---------------------------------------------------------------------------
+// Force on the Xerces debug token if it was on in the build environment
// ---------------------------------------------------------------------------
-#if 0
-#define XML4C_DEBUG
+#if defined(_DEBUG)
+#define XERCES_DEBUG
#endif
+
int stricmp(const char* const str1, const char* const str2);
int strnicmp(const char* const str1, const char* const str2,
const unsigned int count);
@@ -97,6 +124,6 @@
// ---------------------------------------------------------------------------
// The name of the DLL that is built by the CC version of the system.
// ---------------------------------------------------------------------------
-const char* const XML4C_DLLName = "libxerces-c";
+const char* const Xerces_DLLName = "libxerces-c";
#endif // #if !defined(DECCXXDEFS_HPP)
1.2 +27 -4 xml-xerces/c/src/xercesc/util/Compilers/GCCDefs.hpp
Index: GCCDefs.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/Compilers/GCCDefs.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GCCDefs.hpp 1 Feb 2002 22:22:18 -0000 1.1
+++ GCCDefs.hpp 21 May 2002 19:45:53 -0000 1.2
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,8 +56,11 @@
/*
* $Log: GCCDefs.hpp,v $
- * Revision 1.1 2002/02/01 22:22:18 peiyongz
- * Initial revision
+ * Revision 1.2 2002/05/21 19:45:53 tng
+ * Define DOMSize_t and XMLSize_t
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:18 peiyongz
+ * sane_include
*
* Revision 1.14 2001/07/06 17:11:58 tng
* Automatic build of single-threaded library. By Martin Kalen.
@@ -110,6 +113,11 @@
#define GCCDEFS_HPP
// ---------------------------------------------------------------------------
+// Include some runtime files that will be needed product wide
+// ---------------------------------------------------------------------------
+
+
+// ---------------------------------------------------------------------------
// Define these away for this platform
// ---------------------------------------------------------------------------
#define PLATFORM_EXPORT
@@ -117,12 +125,17 @@
// ---------------------------------------------------------------------------
-// Indicate that we support native bools
+// Indicate that we do not support native bools
+// If the compiler can handle boolean itself, do not define it
// ---------------------------------------------------------------------------
// #define NO_NATIVE_BOOL
+
// ---------------------------------------------------------------------------
-// GCC does not support "L" for long strings. So we do nothing.
+// Each compiler might support L"" prefixed constants. There are places
+// where it is advantageous to use the L"" where it supported, to avoid
+// unnecessary transcoding.
+// If your compiler does not support it, don't define this.
// ---------------------------------------------------------------------------
// #define XML_LSTRSUPPORT
@@ -145,9 +158,19 @@
typedef int XMLInt32;
// ---------------------------------------------------------------------------
+// XMLSize_t and DOMSize_t are the unsigned integral type.
+// ---------------------------------------------------------------------------
+#ifdef _SIZE_T
+typedef size_t XMLSize_t;
+#else
+typedef unsigned long XMLSize_t;
+#endif
+typedef XMLSize_t DOMSize_t;
+
+// ---------------------------------------------------------------------------
// Force on the Xerces debug token if it was on in the build environment
// ---------------------------------------------------------------------------
-#if 0
+#if defined(_DEBUG)
#define XERCES_DEBUG
#endif
1.2 +50 -32 xml-xerces/c/src/xercesc/util/Compilers/HPCCDefs.hpp
Index: HPCCDefs.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/Compilers/HPCCDefs.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HPCCDefs.hpp 1 Feb 2002 22:22:18 -0000 1.1
+++ HPCCDefs.hpp 21 May 2002 19:45:53 -0000 1.2
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2002 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.
- *
+ * 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:
+ * 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
+ * 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
@@ -45,7 +45,7 @@
* 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
@@ -56,8 +56,11 @@
/*
* $Log: HPCCDefs.hpp,v $
- * Revision 1.1 2002/02/01 22:22:18 peiyongz
- * Initial revision
+ * Revision 1.2 2002/05/21 19:45:53 tng
+ * Define DOMSize_t and XMLSize_t
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:18 peiyongz
+ * sane_include
*
* Revision 1.11 2001/03/02 20:52:59 knoaman
* Schema: Regular expression - misc. updates for error messages,
@@ -104,6 +107,9 @@
*
*/
+#if !defined(HPCCDEFS_HPP)
+#define HPCCDEFS_HPP
+
// ---------------------------------------------------------------------------
// Define these away for this platform
@@ -114,30 +120,23 @@
// ---------------------------------------------------------------------------
// Indicate that we do not support native bools
+// If the compiler can handle boolean itself, do not define it
// ---------------------------------------------------------------------------
-#if defined(XML_HPUX_CC)
-#ifndef bool
-#define bool char
-#endif
-#ifndef true
- #define true 1
-#endif
-#ifndef false
- #define false 0
-#endif
-#endif
+// #define NO_NATIVE_BOOL
// ---------------------------------------------------------------------------
-// Define our version of the XML character
+// Each compiler might support L"" prefixed constants. There are places
+// where it is advantageous to use the L"" where it supported, to avoid
+// unnecessary transcoding.
+// If your compiler does not support it, don't define this.
// ---------------------------------------------------------------------------
-#ifndef INCLUDE_THIS_FILE
-#define INCLUDE_THIS_FILE
-#include <wchar.h>
-#endif
-typedef unsigned short XMLCh;
-typedef unsigned short UTF16Ch;
+// #define XML_LSTRSUPPORT
+// ---------------------------------------------------------------------------
+// Define our version of the XMLCh.
+// ---------------------------------------------------------------------------
+typedef unsigned short XMLCh;
// ---------------------------------------------------------------------------
// Define unsigned 16 and 32 bits integers
@@ -151,6 +150,23 @@
typedef int XMLInt32;
// ---------------------------------------------------------------------------
+// XMLSize_t and DOMSize_t are the unsigned integral type.
+// ---------------------------------------------------------------------------
+#ifdef _SIZE_T
+typedef size_t XMLSize_t;
+#else
+typedef unsigned long XMLSize_t;
+#endif
+typedef XMLSize_t DOMSize_t;
+
+// ---------------------------------------------------------------------------
+// Force on the Xerces debug token if it was on in the build environment
+// ---------------------------------------------------------------------------
+#if defined(_DEBUG)
+#define XERCES_DEBUG
+#endif
+
+// ---------------------------------------------------------------------------
// Provide prototypes for some string methods that are not always available
// on all platforms.
// ---------------------------------------------------------------------------
@@ -159,6 +175,8 @@
// ---------------------------------------------------------------------------
-// The name of the DLL that is built by the HP CC version of the system.
+// The name of the DLL that is built by the system.
// ---------------------------------------------------------------------------
const char* const Xerces_DLLName = "libxerces-c";
+
+#endif //HPCCDEFS_HPP
1.2 +33 -11 xml-xerces/c/src/xercesc/util/Compilers/IBMVAOS2Defs.hpp
Index: IBMVAOS2Defs.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/Compilers/IBMVAOS2Defs.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IBMVAOS2Defs.hpp 1 Feb 2002 22:22:18 -0000 1.1
+++ IBMVAOS2Defs.hpp 21 May 2002 19:45:53 -0000 1.2
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -55,9 +55,19 @@
*/
/*
- * $Id: IBMVAOS2Defs.hpp,v 1.1 2002/02/01 22:22:18 peiyongz Exp $
+ * $Id: IBMVAOS2Defs.hpp,v 1.2 2002/05/21 19:45:53 tng Exp $
*/
+#if !defined(IBMVAOS2DEFS_HPP)
+#define IBMVAOS2DEFS_HPP
+
+// ---------------------------------------------------------------------------
+// Include some common headers that are needed product wide
+// ---------------------------------------------------------------------------
+#include <STRING.h>
+#include <FLOAT.h>
+#include <MEMORY.h>
+#include <BOOL.h>
// ---------------------------------------------------------------------------
// A define in the build for each project is also used to control whether
@@ -67,7 +77,6 @@
// ---------------------------------------------------------------------------
#define PLATFORM_EXPORT _Export
#define PLATFORM_IMPORT
-#define XERCES_EXPORT
// ---------------------------------------------------------------------------
// Supports L"" prefixed constants. There are places
@@ -78,12 +87,21 @@
#define XML_LSTRSUPPORT
// ---------------------------------------------------------------------------
-// Indicate that we support native bools
+// Indicate that we do not support native bools
+// If the compiler can handle boolean itself, do not define it
// ---------------------------------------------------------------------------
// #define NO_NATIVE_BOOL
// ---------------------------------------------------------------------------
+// Each compiler might support L"" prefixed constants. There are places
+// where it is advantageous to use the L"" where it supported, to avoid
+// unnecessary transcoding.
+// If your compiler does not support it, don't define this.
+// ---------------------------------------------------------------------------
+// #define XML_LSTRSUPPORT
+
+// ---------------------------------------------------------------------------
// Define our version of the XMLCh.
// ---------------------------------------------------------------------------
typedef unsigned short XMLCh;
@@ -101,6 +119,16 @@
typedef int XMLInt32;
// ---------------------------------------------------------------------------
+// XMLSize_t and DOMSize_t are the unsigned integral type.
+// ---------------------------------------------------------------------------
+#ifdef _SIZE_T
+typedef size_t XMLSize_t;
+#else
+typedef unsigned long XMLSize_t;
+#endif
+typedef XMLSize_t DOMSize_t;
+
+// ---------------------------------------------------------------------------
// Force on the Xerces debug token if it was on in the build environment
// ---------------------------------------------------------------------------
#ifdef _DEBUG
@@ -115,10 +143,4 @@
const char* const Xerces_DLLName = "xerces-c";
-// ---------------------------------------------------------------------------
-// Include some common headers that are needed product wide
-// ---------------------------------------------------------------------------
-#include <STRING.h>
-#include <FLOAT.h>
-#include <MEMORY.h>
-#include <BOOL.h>
+#endif //IBMVAOS2DEFS_HPP
1.2 +50 -16 xml-xerces/c/src/xercesc/util/Compilers/IBMVAW32Defs.hpp
Index: IBMVAW32Defs.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/Compilers/IBMVAW32Defs.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IBMVAW32Defs.hpp 1 Feb 2002 22:22:18 -0000 1.1
+++ IBMVAW32Defs.hpp 21 May 2002 19:45:53 -0000 1.2
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2002 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.
- *
+ * 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:
+ * 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
+ * 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
@@ -45,7 +45,7 @@
* 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
@@ -56,8 +56,11 @@
/*
* $Log: IBMVAW32Defs.hpp,v $
- * Revision 1.1 2002/02/01 22:22:18 peiyongz
- * Initial revision
+ * Revision 1.2 2002/05/21 19:45:53 tng
+ * Define DOMSize_t and XMLSize_t
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:18 peiyongz
+ * sane_include
*
* Revision 1.5 2000/03/02 19:55:08 roddey
* This checkin includes many changes done while waiting for the
@@ -78,6 +81,8 @@
*
*/
+#if !defined(IBMVAW32DEFS_HPP)
+#define IBMVAW32DEFS_HPP
// ---------------------------------------------------------------------------
@@ -88,20 +93,47 @@
// ---------------------------------------------------------------------------
#define PLATFORM_EXPORT __declspec(dllexport)
#define PLATFORM_IMPORT
-#define XERCES_EXPORT
-
// ---------------------------------------------------------------------------
-// Indicate that we support native bools
+// Indicate that we do not support native bools
+// If the compiler can handle boolean itself, do not define it
// ---------------------------------------------------------------------------
// #define NO_NATIVE_BOOL
// ---------------------------------------------------------------------------
+// Each compiler might support L"" prefixed constants. There are places
+// where it is advantageous to use the L"" where it supported, to avoid
+// unnecessary transcoding.
+// If your compiler does not support it, don't define this.
+// ---------------------------------------------------------------------------
+// #define XML_LSTRSUPPORT
+
+// ---------------------------------------------------------------------------
// Define our version of the XMLCh.
// ---------------------------------------------------------------------------
typedef unsigned short XMLCh;
+// ---------------------------------------------------------------------------
+// Define unsigned 16 and 32 bits integers
+// ---------------------------------------------------------------------------
+typedef unsigned short XMLUInt16;
+typedef unsigned int XMLUInt32;
+
+// ---------------------------------------------------------------------------
+// Define signed 32 bits integers
+// ---------------------------------------------------------------------------
+typedef int XMLInt32;
+
+// ---------------------------------------------------------------------------
+// XMLSize_t and DOMSize_t are the unsigned integral type.
+// ---------------------------------------------------------------------------
+#ifdef _SIZE_T
+typedef size_t XMLSize_t;
+#else
+typedef unsigned long XMLSize_t;
+#endif
+typedef XMLSize_t DOMSize_t;
// ---------------------------------------------------------------------------
// Force on the Xerces debug token if it was on in the build environment
@@ -118,3 +150,5 @@
// file is included into.
// ---------------------------------------------------------------------------
const char* const Xerces_DLLName = "VAWXERCESC" Xerces_DLLVersionStr;
+
+#endif //IBMVAW32DEFS_HPP
1.2 +54 -13 xml-xerces/c/src/xercesc/util/Compilers/MIPSproDefs.hpp
Index: MIPSproDefs.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/Compilers/MIPSproDefs.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MIPSproDefs.hpp 1 Feb 2002 22:22:18 -0000 1.1
+++ MIPSproDefs.hpp 21 May 2002 19:45:53 -0000 1.2
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2002 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.
- *
+ * 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:
+ * 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
+ * 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
@@ -45,7 +45,7 @@
* 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
@@ -56,8 +56,11 @@
/*
* $Log: MIPSproDefs.hpp,v $
- * Revision 1.1 2002/02/01 22:22:18 peiyongz
- * Initial revision
+ * Revision 1.2 2002/05/21 19:45:53 tng
+ * Define DOMSize_t and XMLSize_t
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:18 peiyongz
+ * sane_include
*
* Revision 1.5 2001/03/02 20:53:01 knoaman
* Schema: Regular expression - misc. updates for error messages,
@@ -85,6 +88,9 @@
*
*/
+#if !defined(MIPSPRODEFS_HPP)
+#define MIPSPRODEFS_HPP
+
// ---------------------------------------------------------------------------
// Define these away for this platform
@@ -94,6 +100,21 @@
// ---------------------------------------------------------------------------
+// Indicate that we do not support native bools
+// If the compiler can handle boolean itself, do not define it
+// ---------------------------------------------------------------------------
+// #define NO_NATIVE_BOOL
+
+
+// ---------------------------------------------------------------------------
+// Each compiler might support L"" prefixed constants. There are places
+// where it is advantageous to use the L"" where it supported, to avoid
+// unnecessary transcoding.
+// If your compiler does not support it, don't define this.
+// ---------------------------------------------------------------------------
+// #define XML_LSTRSUPPORT
+
+// ---------------------------------------------------------------------------
// Define our version of the XML character
// ---------------------------------------------------------------------------
typedef unsigned short XMLCh;
@@ -112,6 +133,24 @@
typedef int XMLInt32;
// ---------------------------------------------------------------------------
+// XMLSize_t and DOMSize_t are the unsigned integral type.
+// ---------------------------------------------------------------------------
+#ifdef _SIZE_T
+typedef size_t XMLSize_t;
+#else
+typedef unsigned long XMLSize_t;
+#endif
+typedef XMLSize_t DOMSize_t;
+
+// ---------------------------------------------------------------------------
+// Force on the Xerces debug token if it was on in the build environment
+// ---------------------------------------------------------------------------
+#if defined(_DEBUG)
+#define XERCES_DEBUG
+#endif
+
+
+// ---------------------------------------------------------------------------
// Provide prototypes for some string methods that are not always available
// on all platforms.
// ---------------------------------------------------------------------------
@@ -125,3 +164,5 @@
// file is included into.
// ---------------------------------------------------------------------------
const char* const Xerces_DLLName = "libxerces-c";
+
+#endif //MIPSPRODEFS_HPP
1.2 +24 -10 xml-xerces/c/src/xercesc/util/Compilers/MVSCPPDefs.hpp
Index: MVSCPPDefs.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/Compilers/MVSCPPDefs.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MVSCPPDefs.hpp 1 Feb 2002 22:22:18 -0000 1.1
+++ MVSCPPDefs.hpp 21 May 2002 19:45:53 -0000 1.2
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,8 +56,11 @@
/*
* $Log: MVSCPPDefs.hpp,v $
- * Revision 1.1 2002/02/01 22:22:18 peiyongz
- * Initial revision
+ * Revision 1.2 2002/05/21 19:45:53 tng
+ * Define DOMSize_t and XMLSize_t
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:18 peiyongz
+ * sane_include
*
* Revision 1.8 2001/03/02 20:53:03 knoaman
* Schema: Regular expression - misc. updates for error messages,
@@ -113,18 +116,19 @@
#define PLATFORM_IMPORT _Export
// ---------------------------------------------------------------------------
-// Supports L"" prefixed constants. There are places
-// where it is advantageous to use the L"" where it supported, to avoid
-// unnecessary transcoding. c++ does support this, so we define this token.
-// If your compiler does not support it, don't define this.
+// Indicate that we do not support native bools
+// If the compiler can handle boolean itself, do not define it
// ---------------------------------------------------------------------------
-#define XML_LSTRSUPPORT
+#define NO_NATIVE_BOOL
+
// ---------------------------------------------------------------------------
-// Indicate that we do not support native bools
+// Each compiler might support L"" prefixed constants. There are places
+// where it is advantageous to use the L"" where it supported, to avoid
+// unnecessary transcoding.
+// If your compiler does not support it, don't define this.
// ---------------------------------------------------------------------------
-#define NO_NATIVE_BOOL
-
+#define XML_LSTRSUPPORT
// ---------------------------------------------------------------------------
// Define our version of the XML character
@@ -144,9 +148,19 @@
typedef int XMLInt32;
// ---------------------------------------------------------------------------
+// XMLSize_t and DOMSize_t are the unsigned integral type.
+// ---------------------------------------------------------------------------
+#ifdef _SIZE_T
+typedef size_t XMLSize_t;
+#else
+typedef unsigned long XMLSize_t;
+#endif
+typedef XMLSize_t DOMSize_t;
+n
+// ---------------------------------------------------------------------------
// Force on the Xerces debug token if it was on in the build environment
// ---------------------------------------------------------------------------
-#if 0
+#if defined(_DEBUG)
#define XERCES_DEBUG
#endif
1.2 +35 -17 xml-xerces/c/src/xercesc/util/Compilers/OS400SetDefs.hpp
Index: OS400SetDefs.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/Compilers/OS400SetDefs.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- OS400SetDefs.hpp 1 Feb 2002 22:22:19 -0000 1.1
+++ OS400SetDefs.hpp 21 May 2002 19:45:53 -0000 1.2
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2002 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.
- *
+ * 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:
+ * 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
+ * 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
@@ -45,7 +45,7 @@
* 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
@@ -55,12 +55,12 @@
*/
/*
- * $Id: OS400SetDefs.hpp,v 1.1 2002/02/01 22:22:19 peiyongz Exp $
+ * $Id: OS400SetDefs.hpp,v 1.2 2002/05/21 19:45:53 tng Exp $
*/
#ifndef OS400SETDEFS_H
-#define OS400SETDEFS_H
+#define OS400SETDEFS_H
// ---------------------------------------------------------------------------
// Define these away for this platform
@@ -71,6 +71,7 @@
// ---------------------------------------------------------------------------
// Indicate that we do not support native bools
+// If the compiler can handle boolean itself, do not define it
// ---------------------------------------------------------------------------
#if !defined(__BOOL__)
#define NO_NATIVE_BOOL
@@ -78,6 +79,14 @@
// ---------------------------------------------------------------------------
+// Each compiler might support L"" prefixed constants. There are places
+// where it is advantageous to use the L"" where it supported, to avoid
+// unnecessary transcoding.
+// If your compiler does not support it, don't define this.
+// ---------------------------------------------------------------------------
+// #define XML_LSTRSUPPORT
+
+// ---------------------------------------------------------------------------
// Define our version of the XML character
// ---------------------------------------------------------------------------
typedef unsigned short XMLCh;
@@ -94,11 +103,20 @@
// ---------------------------------------------------------------------------
typedef int XMLInt32;
+// ---------------------------------------------------------------------------
+// XMLSize_t and DOMSize_t are the unsigned integral type.
+// ---------------------------------------------------------------------------
+#ifdef _SIZE_T
+typedef size_t XMLSize_t;
+#else
+typedef unsigned long XMLSize_t;
+#endif
+typedef XMLSize_t DOMSize_t;
// ---------------------------------------------------------------------------
// Force on the Xerces debug token if it was on in the build environment
// ---------------------------------------------------------------------------
-#if 0
+#if defined(_DEBUG)
#define XERCES_DEBUG
#endif
@@ -111,4 +129,4 @@
// ---------------------------------------------------------------------------
const char* const Xerces_DLLName = "libxercesc";
-#endif
+#endif //OS400SETDEFS_H
1.2 +46 -30 xml-xerces/c/src/xercesc/util/Compilers/PTXCCDefs.hpp
Index: PTXCCDefs.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/Compilers/PTXCCDefs.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PTXCCDefs.hpp 1 Feb 2002 22:22:19 -0000 1.1
+++ PTXCCDefs.hpp 21 May 2002 19:45:53 -0000 1.2
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2002 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.
- *
+ * 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:
+ * 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
+ * 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
@@ -45,7 +45,7 @@
* 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
@@ -56,8 +56,11 @@
/*
* $Log: PTXCCDefs.hpp,v $
- * Revision 1.1 2002/02/01 22:22:19 peiyongz
- * Initial revision
+ * Revision 1.2 2002/05/21 19:45:53 tng
+ * Define DOMSize_t and XMLSize_t
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:19 peiyongz
+ * sane_include
*
* Revision 1.3 2001/03/02 20:53:05 knoaman
* Schema: Regular expression - misc. updates for error messages,
@@ -66,7 +69,10 @@
* Revision 1.2 2000/04/04 21:07:39 abagchi
* Fixed copyrights with initial checkin
*
- */
+ */
+
+#if !defined(PTXCCDEFS_HPP)
+#define PTXCCDEFS_HPP
// ---------------------------------------------------------------------------
// Define these away for this platform
@@ -77,11 +83,20 @@
// ---------------------------------------------------------------------------
// Indicate that we do not support native bools
+// If the compiler can handle boolean itself, do not define it
// ---------------------------------------------------------------------------
// #define NO_NATIVE_BOOL
// ---------------------------------------------------------------------------
+// Each compiler might support L"" prefixed constants. There are places
+// where it is advantageous to use the L"" where it supported, to avoid
+// unnecessary transcoding.
+// If your compiler does not support it, don't define this.
+// ---------------------------------------------------------------------------
+// #define XML_LSTRSUPPORT
+
+// ---------------------------------------------------------------------------
// Define our version of the XML character
// ---------------------------------------------------------------------------
typedef unsigned short XMLCh;
@@ -98,11 +113,21 @@
typedef int XMLInt32;
// ---------------------------------------------------------------------------
-// Force on the XML4C debug token if it was on in the build environment
+// XMLSize_t and DOMSize_t are the unsigned integral type.
+// ---------------------------------------------------------------------------
+#ifdef _SIZE_T
+typedef size_t XMLSize_t;
+#else
+typedef unsigned long XMLSize_t;
+#endif
+typedef XMLSize_t DOMSize_t;
+
+// ---------------------------------------------------------------------------
+// Force on the Xerces debug token if it was on in the build environment
// ---------------------------------------------------------------------------
-#if 0
-#define XML4C_DEBUG
-#endif
+#if defined(_DEBUG)
+#define XERCES_DEBUG
+#endif
int stricmp(const char* const str1, const char* const str2);
@@ -110,17 +135,8 @@
// ---------------------------------------------------------------------------
-// Force on the XML4C2 debug token if it was on in the build environment
+// The name of the DLL that is built by the system
// ---------------------------------------------------------------------------
-#if 0
-#define XML4C2_DEBUG
-#endif
+const char* const Xerces_DLLName = "libxerces-c";
-
-// ---------------------------------------------------------------------------
-// The name of the DLL that is built by the Visual C++ version of the
-// system. We append a previously defined token which holds the DLL
-// versioning string. This is defined in XML4CDefs.hpp which is what this
-// file is included into.
-// ---------------------------------------------------------------------------
-const char* const XML4C_DLLName = "libxerces-c";
+#endif //PTXCCDEFS_HPP
1.2 +61 -18 xml-xerces/c/src/xercesc/util/Compilers/SCOCCDefs.hpp
Index: SCOCCDefs.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/Compilers/SCOCCDefs.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SCOCCDefs.hpp 1 Feb 2002 22:22:19 -0000 1.1
+++ SCOCCDefs.hpp 21 May 2002 19:45:53 -0000 1.2
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2002 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.
- *
+ * 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:
+ * 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
+ * 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
@@ -45,7 +45,7 @@
* 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
@@ -56,8 +56,11 @@
/*
* $Log: SCOCCDefs.hpp,v $
- * Revision 1.1 2002/02/01 22:22:19 peiyongz
- * Initial revision
+ * Revision 1.2 2002/05/21 19:45:53 tng
+ * Define DOMSize_t and XMLSize_t
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:19 peiyongz
+ * sane_include
*
* Revision 1.3 2000/03/02 19:55:09 roddey
* This checkin includes many changes done while waiting for the
@@ -74,6 +77,9 @@
* 14-Nov-1999
*/
+#if !defined(SCOCCDEFS_HPP)
+#define SCOCCDEFS_HPP
+
// ---------------------------------------------------------------------------
// Define these away for this platform
@@ -83,20 +89,57 @@
// ---------------------------------------------------------------------------
-// Indicate that we do support native bools
+// Indicate that we do not support native bools
+// If the compiler can handle boolean itself, do not define it
// ---------------------------------------------------------------------------
-#if defined(NO_NATIVE_BOOL)
-#undef NO_NATIVE_BOOL
-#endif
+// #define NO_NATIVE_BOOL
// ---------------------------------------------------------------------------
-// Define our version of the XML character
+// Each compiler might support L"" prefixed constants. There are places
+// where it is advantageous to use the L"" where it supported, to avoid
+// unnecessary transcoding.
+// If your compiler does not support it, don't define this.
+// ---------------------------------------------------------------------------
+// #define XML_LSTRSUPPORT
+
+// ---------------------------------------------------------------------------
+// Define our version of the XMLCh.
// ---------------------------------------------------------------------------
typedef unsigned short XMLCh;
+// ---------------------------------------------------------------------------
+// Define unsigned 16 and 32 bits integers
+// ---------------------------------------------------------------------------
+typedef unsigned short XMLUInt16;
+typedef unsigned int XMLUInt32;
+
+// ---------------------------------------------------------------------------
+// Define signed 32 bits integers
+// ---------------------------------------------------------------------------
+typedef int XMLInt32;
+
+// ---------------------------------------------------------------------------
+// XMLSize_t and DOMSize_t are the unsigned integral type.
+// ---------------------------------------------------------------------------
+#ifdef _SIZE_T
+typedef size_t XMLSize_t;
+#else
+typedef unsigned long XMLSize_t;
+#endif
+typedef XMLSize_t DOMSize_t;
+
+// ---------------------------------------------------------------------------
+// Force on the Xerces debug token if it was on in the build environment
+// ---------------------------------------------------------------------------
+#if defined(_DEBUG)
+#define XERCES_DEBUG
+#endif
+
// ---------------------------------------------------------------------------
// The name of the DLL that is built by the CC version of the system.
// ---------------------------------------------------------------------------
const char* const Xerces_DLLName = "libxerces-c";
+
+#endif //SCOCCDEFS_HPP
1.2 +26 -3 xml-xerces/c/src/xercesc/util/Compilers/SunCCDefs.hpp
Index: SunCCDefs.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/Compilers/SunCCDefs.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SunCCDefs.hpp 1 Feb 2002 22:22:19 -0000 1.1
+++ SunCCDefs.hpp 21 May 2002 19:45:53 -0000 1.2
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,8 +56,11 @@
/*
* $Log: SunCCDefs.hpp,v $
- * Revision 1.1 2002/02/01 22:22:19 peiyongz
- * Initial revision
+ * Revision 1.2 2002/05/21 19:45:53 tng
+ * Define DOMSize_t and XMLSize_t
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:19 peiyongz
+ * sane_include
*
* Revision 1.12 2001/03/02 20:53:07 knoaman
* Schema: Regular expression - misc. updates for error messages,
@@ -116,7 +119,8 @@
// ---------------------------------------------------------------------------
-// Indicate that we do not support native bools
+// Indicate that we do not support native bools
+// If the compiler can handle boolean itself, do not define it
// ---------------------------------------------------------------------------
#if !defined(_BOOL)
#define NO_NATIVE_BOOL
@@ -124,6 +128,15 @@
// ---------------------------------------------------------------------------
+// Each compiler might support L"" prefixed constants. There are places
+// where it is advantageous to use the L"" where it supported, to avoid
+// unnecessary transcoding.
+// If your compiler does not support it, don't define this.
+// ---------------------------------------------------------------------------
+// #define XML_LSTRSUPPORT
+
+
+// ---------------------------------------------------------------------------
// Define our version of the XML character
// ---------------------------------------------------------------------------
typedef unsigned short XMLCh;
@@ -141,9 +154,19 @@
typedef int XMLInt32;
// ---------------------------------------------------------------------------
+// XMLSize_t and DOMSize_t are the unsigned integral type.
+// ---------------------------------------------------------------------------
+#ifdef _SIZE_T
+typedef size_t XMLSize_t;
+#else
+typedef unsigned long XMLSize_t;
+#endif
+typedef XMLSize_t DOMSize_t;
+
+// ---------------------------------------------------------------------------
// Force on the Xerces debug token if it was on in the build environment
// ---------------------------------------------------------------------------
-#if 0
+#if defined(_DEBUG)
#define XERCES_DEBUG
#endif
1.2 +58 -33 xml-xerces/c/src/xercesc/util/Compilers/SunKaiDefs.hpp
Index: SunKaiDefs.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/Compilers/SunKaiDefs.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SunKaiDefs.hpp 1 Feb 2002 22:22:19 -0000 1.1
+++ SunKaiDefs.hpp 21 May 2002 19:45:53 -0000 1.2
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2002 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.
- *
+ * 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:
+ * 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
+ * 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
@@ -45,7 +45,7 @@
* 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
@@ -56,8 +56,11 @@
/*
* $Log: SunKaiDefs.hpp,v $
- * Revision 1.1 2002/02/01 22:22:19 peiyongz
- * Initial revision
+ * Revision 1.2 2002/05/21 19:45:53 tng
+ * Define DOMSize_t and XMLSize_t
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:19 peiyongz
+ * sane_include
*
* Revision 1.5 2000/03/02 19:55:09 roddey
* This checkin includes many changes done while waiting for the
@@ -78,15 +81,8 @@
*
*/
-
-// ---------------------------------------------------------------------------
-// NOTE:
-//
-// Xerces is not officially supported with the KAI compiler. This file
-// was sent in by one of the users and is included in the distribution
-// just for convenience. Please send any defects / modification
-// reports to xml4c@us.ibm.com
-// ---------------------------------------------------------------------------
+#if !defined(SUNKAIDEFS_HPP)
+#define SUNKAIDEFS_HPP
// ---------------------------------------------------------------------------
@@ -104,37 +100,65 @@
// to do this.
// ---------------------------------------------------------------------------
#define PLATFORM_EXPORT
-#define PLATFORM_IMPORT
-
+#define PLATFORM_IMPORT
// ---------------------------------------------------------------------------
-// Indicate that we support native bools
+// Indicate that we do not support native bools
+// If the compiler can handle boolean itself, do not define it
// ---------------------------------------------------------------------------
// #define NO_NATIVE_BOOL
// ---------------------------------------------------------------------------
+// Each compiler might support L"" prefixed constants. There are places
+// where it is advantageous to use the L"" where it supported, to avoid
+// unnecessary transcoding.
+// If your compiler does not support it, don't define this.
+// ---------------------------------------------------------------------------
+// #define XML_LSTRSUPPORT
+
+
+// ---------------------------------------------------------------------------
// Define our version of the XMLCh.
// ---------------------------------------------------------------------------
typedef unsigned short XMLCh;
-
// ---------------------------------------------------------------------------
-// The name of the DLL that is built by the Visual C++ version of the
-// system. We append a previously defined token which holds the DLL
-// versioning string. This is defined in XercesDefs.hpp which is what this
-// file is included into.
+// Define unsigned 16 and 32 bits integers
// ---------------------------------------------------------------------------
-const char* const Xerces_DLLName = "KAIXERCESC" Xerces_DLLVersionStr;
+typedef unsigned short XMLUInt16;
+typedef unsigned int XMLUInt32;
+// ---------------------------------------------------------------------------
+// Define signed 32 bits integers
+// ---------------------------------------------------------------------------
+typedef int XMLInt32;
// ---------------------------------------------------------------------------
-// Define some platform specific defines
+// XMLSize_t and DOMSize_t are the unsigned integral type.
// ---------------------------------------------------------------------------
-#define XERCES_EXPORT
+#ifdef _SIZE_T
+typedef size_t XMLSize_t;
+#else
+typedef unsigned long XMLSize_t;
+#endif
+typedef XMLSize_t DOMSize_t;
+// ---------------------------------------------------------------------------
+// Force on the Xerces debug token if it was on in the build environment
+// ---------------------------------------------------------------------------
+#if defined(_DEBUG)
+#define XERCES_DEBUG
+#endif
+// ---------------------------------------------------------------------------
+// The name of the DLL that is built by the system.
+// We append a previously defined token which holds the DLL
+// versioning string. This is defined in XercesDefs.hpp which is what this
+// file is included into.
+// ---------------------------------------------------------------------------
+const char* const Xerces_DLLName = "KAIXERCESC" Xerces_DLLVersionStr;
// ---------------------------------------------------------------------------
// Provide prototypes for some string functions that are not provided on all
@@ -143,3 +167,4 @@
int stricmp(const char* const str1, const char* const str2);
int strnicmp(const char* const str1, const char* const str2, const unsigned int count);
+#endif //SUNKAIDEFS_HPP
1.2 +51 -20 xml-xerces/c/src/xercesc/util/Compilers/TandemCCDefs.hpp
Index: TandemCCDefs.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/Compilers/TandemCCDefs.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TandemCCDefs.hpp 1 Feb 2002 22:22:19 -0000 1.1
+++ TandemCCDefs.hpp 21 May 2002 19:45:53 -0000 1.2
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ *
+ * Copyright (c) 1999-2002 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.
- *
+ * 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:
+ * 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
+ * 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
@@ -45,7 +45,7 @@
* 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
@@ -56,8 +56,11 @@
/*
* $Log: TandemCCDefs.hpp,v $
- * Revision 1.1 2002/02/01 22:22:19 peiyongz
- * Initial revision
+ * Revision 1.2 2002/05/21 19:45:53 tng
+ * Define DOMSize_t and XMLSize_t
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:19 peiyongz
+ * sane_include
*
* Revision 1.6 2000/03/09 18:54:45 abagchi
* Added header-guards to include inlines only once
@@ -93,20 +96,49 @@
// ---------------------------------------------------------------------------
// Indicate that we do not support native bools
+// If the compiler can handle boolean itself, do not define it
// ---------------------------------------------------------------------------
-#undef NO_NATIVE_BOOL
+// #define NO_NATIVE_BOOL
// ---------------------------------------------------------------------------
-// Define our version of the XML character
+// Each compiler might support L"" prefixed constants. There are places
+// where it is advantageous to use the L"" where it supported, to avoid
+// unnecessary transcoding.
+// If your compiler does not support it, don't define this.
+// ---------------------------------------------------------------------------
+// #define XML_LSTRSUPPORT
+
+// ---------------------------------------------------------------------------
+// Define our version of the XMLCh.
// ---------------------------------------------------------------------------
typedef unsigned short XMLCh;
+// ---------------------------------------------------------------------------
+// Define unsigned 16 and 32 bits integers
+// ---------------------------------------------------------------------------
+typedef unsigned short XMLUInt16;
+typedef unsigned int XMLUInt32;
+
+// ---------------------------------------------------------------------------
+// Define signed 32 bits integers
+// ---------------------------------------------------------------------------
+typedef int XMLInt32;
// ---------------------------------------------------------------------------
-// Force on the XERCES debug token if it was on in the build environment
+// XMLSize_t and DOMSize_t are the unsigned integral type.
// ---------------------------------------------------------------------------
-#if 0
+#ifdef _SIZE_T
+typedef size_t XMLSize_t;
+#else
+typedef unsigned long XMLSize_t;
+#endif
+typedef XMLSize_t DOMSize_t;
+
+// ---------------------------------------------------------------------------
+// Force on the Xerces debug token if it was on in the build environment
+// ---------------------------------------------------------------------------
+#if defined(_DEBUG)
#define XERCES_DEBUG
#endif
@@ -114,7 +146,7 @@
// ---------------------------------------------------------------------------
// Provide some common string ops that are different.
// ---------------------------------------------------------------------------
-inline char toupper(const char toUpper)
+inline char toupper(const char toUpper)
{
if ((toUpper >= 'a') && (toUpper <= 'z'))
return char(toUpper - 0x20);
@@ -132,9 +164,8 @@
int strnicmp(const char* const str1, const char* const str2, const unsigned int count);
-
// ---------------------------------------------------------------------------
-// The name of the library that is built by the Tandem version of the system.
+// The name of the DLL that is built by the system.
// ---------------------------------------------------------------------------
const char* const Xerces_DLLName = "libxerces-c";
1.3 +29 -12 xml-xerces/c/src/xercesc/util/Compilers/VCPPDefs.hpp
Index: VCPPDefs.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/Compilers/VCPPDefs.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- VCPPDefs.hpp 17 Apr 2002 20:30:01 -0000 1.2
+++ VCPPDefs.hpp 21 May 2002 19:45:53 -0000 1.3
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
/*
* $Log: VCPPDefs.hpp,v $
+ * Revision 1.3 2002/05/21 19:45:53 tng
+ * Define DOMSize_t and XMLSize_t
+ *
* Revision 1.2 2002/04/17 20:30:01 tng
* [Bug 7583] Build warnings with MS Visual Studio .NET.
*
@@ -113,6 +116,8 @@
*
*/
+#if !defined(VCPPDEFS_HPP)
+#define VCPPDEFS_HPP
// ---------------------------------------------------------------------------
@@ -126,18 +131,19 @@
// ---------------------------------------------------------------------------
-// Each compiler might support L"" prefixed constants. There are places
-// where it is advantageous to use the L"" where it supported, to avoid
-// unnecessary transcoding. VC++ does support this, so we define this token.
-// If your compiler does not support it, don't define this.
+// Indicate that we do not support native bools
+// If the compiler can handle boolean itself, do not define it
// ---------------------------------------------------------------------------
-#define XML_LSTRSUPPORT
+// #define NO_NATIVE_BOOL
// ---------------------------------------------------------------------------
-// Indicate that we support native bools
+// Each compiler might support L"" prefixed constants. There are places
+// where it is advantageous to use the L"" where it supported, to avoid
+// unnecessary transcoding.
+// If your compiler does not support it, don't define this.
// ---------------------------------------------------------------------------
-// #define NO_NATIVE_BOOL
+#define XML_LSTRSUPPORT
// ---------------------------------------------------------------------------
@@ -146,7 +152,6 @@
// intrinsic type and is just mapped to unsigned short.
// ---------------------------------------------------------------------------
typedef unsigned short XMLCh;
-typedef unsigned short UTF16Ch;
// ---------------------------------------------------------------------------
@@ -161,6 +166,16 @@
typedef int XMLInt32;
// ---------------------------------------------------------------------------
+// XMLSize_t and DOMSize_t are the unsigned integral type.
+// ---------------------------------------------------------------------------
+#ifdef _SIZE_T
+typedef size_t XMLSize_t;
+#else
+typedef unsigned long XMLSize_t;
+#endif
+typedef XMLSize_t DOMSize_t;
+
+// ---------------------------------------------------------------------------
// Force on the Xerces debug token if it was on in the build environment
// ---------------------------------------------------------------------------
#if defined(_DEBUG)
@@ -181,15 +196,17 @@
#endif
// ---------------------------------------------------------------------------
-// For IDOM:
+// For DOM:
// Bypass compiler warning:
// no matching operator delete found; memory will not be freed if initialization throws an exception
// ---------------------------------------------------------------------------
#if _MSC_VER >= 1200 /* VC++ 6.0 */
-class IDOM_Document;
-inline void operator delete(void* ptr, IDOM_Document *doc)
+class DOMDocument;
+inline void operator delete(void* ptr, DOMDocument *doc)
{
return;
}
#endif
+
+#endif //VCPPDEFS_HPP
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org