From kwaclaw at users.sourceforge.net  Tue Dec 13 18:51:56 2005
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Tue, 13 Dec 2005 18:51:56 +0100 (CET)
Subject: [Expat-checkins] expat/doc reference.html,1.66,1.67
Message-ID: <20051213175156.B04301E4002@bag.python.org>

Update of /cvsroot/expat/expat/doc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32326

Modified Files:
	reference.html 
Log Message:
Fixed omission of UTF-16 output.

Index: reference.html
===================================================================
RCS file: /cvsroot/expat/expat/doc/reference.html,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- reference.html	28 Nov 2005 20:00:50 -0000	1.66
+++ reference.html	13 Dec 2005 17:20:16 -0000	1.67
@@ -1209,10 +1209,11 @@
 a return value.</p>
 
 <p>Your handlers will be receiving strings in arrays of type
-<code>XML_Char</code>. This type is defined in expat.h as <code>char
-*</code> and contains bytes encoding UTF-8.  Note that you'll receive
-them in this form independent of the original encoding of the
-document.</p>
+<code>XML_Char</code>. This type is conditionally defined in expat.h as
+either <code>char</code>, <code>wchar_t</code> or <code>unsigned short</code>.
+The former implies UTF-8 encoding, the latter two imply UTF-16 encoding.
+Note that you'll receive them in this form independent of the original
+encoding of the document.</p>
 
 <div class="handler">
 <pre class="setter" id="XML_SetStartElementHandler">


From kwaclaw at users.sourceforge.net  Fri Dec 16 18:41:25 2005
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Fri, 16 Dec 2005 18:41:25 +0100 (CET)
Subject: [Expat-checkins] expat/lib winconfig.h,1.3,1.4
Message-ID: <20051216174125.AF1071E4002@bag.python.org>

Update of /cvsroot/expat/expat/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21071

Modified Files:
	winconfig.h 
Log Message:
Fixed non-standard line breaks.

Index: winconfig.h
===================================================================
RCS file: /cvsroot/expat/expat/lib/winconfig.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- winconfig.h	20 May 2002 11:01:29 -0000	1.3
+++ winconfig.h	16 Dec 2005 17:41:19 -0000	1.4
@@ -1,30 +1,30 @@
-/*================================================================
-** Copyright 2000, Clark Cooper
-** All rights reserved.
-**
-** This is free software. You are permitted to copy, distribute, or modify
-** it under the terms of the MIT/X license (contained in the COPYING file
-** with this distribution.)
-*/
-
-#ifndef WINCONFIG_H
-#define WINCONFIG_H
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#undef WIN32_LEAN_AND_MEAN
-
-#include <memory.h>
-#include <string.h>
-
-#define XML_NS 1
-#define XML_DTD 1
-#define XML_CONTEXT_BYTES 1024
-
-/* we will assume all Windows platforms are little endian */
-#define BYTEORDER 1234
-
-/* Windows has memmove() available. */
-#define HAVE_MEMMOVE
-
-#endif /* ndef WINCONFIG_H */
+/*================================================================
+** Copyright 2000, Clark Cooper
+** All rights reserved.
+**
+** This is free software. You are permitted to copy, distribute, or modify
+** it under the terms of the MIT/X license (contained in the COPYING file
+** with this distribution.)
+*/
+
+#ifndef WINCONFIG_H
+#define WINCONFIG_H
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#undef WIN32_LEAN_AND_MEAN
+
+#include <memory.h>
+#include <string.h>
+
+#define XML_NS 1
+#define XML_DTD 1
+#define XML_CONTEXT_BYTES 1024
+
+/* we will assume all Windows platforms are little endian */
+#define BYTEORDER 1234
+
+/* Windows has memmove() available. */
+#define HAVE_MEMMOVE
+
+#endif /* ndef WINCONFIG_H */


From kwaclaw at users.sourceforge.net  Fri Dec 23 15:45:32 2005
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Fri, 23 Dec 2005 15:45:32 +0100 (CET)
Subject: [Expat-checkins] expat/doc reference.html,1.67,1.68
Message-ID: <20051223144532.067E41E4002@bag.python.org>

Update of /cvsroot/expat/expat/doc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22010/doc

Modified Files:
	reference.html 
Log Message:
Added support for 64-bit integers when reporting byte indexes,
line and column numbers. Can be turned on/off using the
XML_LARGE_SIZE switch.

Index: reference.html
===================================================================
RCS file: /cvsroot/expat/expat/doc/reference.html,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- reference.html	13 Dec 2005 17:20:16 -0000	1.67
+++ reference.html	23 Dec 2005 14:45:27 -0000	1.68
@@ -344,6 +344,16 @@
 short</code> is used.  Defining this implies
 <code>XML_UNICODE</code>.</dd>
 
+<dt>XML_LARGE_SIZE</dt>
+<dd>If defined, causes the <code>XML_Size</code> and <code>XML_Index</code>
+integer types to be at least 64 bits in size. This is intended to support
+processing of very large input streams, where the return values of
+<code><a href="#XML_GetCurrentByteIndex" >XML_GetCurrentByteIndex</a></code>,
+<code><a href="#XML_GetCurrentLineNumber" >XML_GetCurrentLineNumber</a></code> and
+<code><a href="#XML_GetCurrentColumnNumber" >XML_GetCurrentColumnNumber</a></code>
+could overflow. It may not be supported by all compilers, and is turned
+off by default.</dd>
+
 <dt>XML_CONTEXT_BYTES</dt>
 <dd>The number of input bytes of markup context which the parser will
 ensure are available for reporting via <code><a href=
@@ -1905,7 +1915,7 @@
 </div>
 
 <pre class="fcndec" id="XML_GetCurrentByteIndex">
-long XMLCALL
+XML_Index XMLCALL
 XML_GetCurrentByteIndex(XML_Parser p);
 </pre>
 <div class="fcndef">
@@ -1916,7 +1926,7 @@
 </div>
 
 <pre class="fcndec" id="XML_GetCurrentLineNumber">
-int XMLCALL
+XML_Size XMLCALL
 XML_GetCurrentLineNumber(XML_Parser p);
 </pre>
 <div class="fcndef">
@@ -1925,7 +1935,7 @@
 </div>
 
 <pre class="fcndec" id="XML_GetCurrentColumnNumber">
-int XMLCALL
+XML_Size XMLCALL
 XML_GetCurrentColumnNumber(XML_Parser p);
 </pre>
 <div class="fcndef">


From kwaclaw at users.sourceforge.net  Fri Dec 23 15:45:33 2005
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Fri, 23 Dec 2005 15:45:33 +0100 (CET)
Subject: [Expat-checkins] expat/lib expat.h, 1.76, 1.77 expat_external.h, 1.3,
	1.4 xmlparse.c, 1.150, 1.151 xmltok.h, 1.10, 1.11
Message-ID: <20051223144533.ABFED1E4002@bag.python.org>

Update of /cvsroot/expat/expat/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22010/lib

Modified Files:
	expat.h expat_external.h xmlparse.c xmltok.h 
Log Message:
Added support for 64-bit integers when reporting byte indexes,
line and column numbers. Can be turned on/off using the
XML_LARGE_SIZE switch.

Index: expat.h
===================================================================
RCS file: /cvsroot/expat/expat/lib/expat.h,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- expat.h	29 Jan 2005 04:48:43 -0000	1.76
+++ expat.h	23 Dec 2005 14:45:27 -0000	1.77
@@ -905,9 +905,9 @@
    was detected; otherwise the location is the location of the last
    parse event, as described above.
 */
-XMLPARSEAPI(int) XML_GetCurrentLineNumber(XML_Parser parser);
-XMLPARSEAPI(int) XML_GetCurrentColumnNumber(XML_Parser parser);
-XMLPARSEAPI(long) XML_GetCurrentByteIndex(XML_Parser parser);
+XMLPARSEAPI(XML_Size) XML_GetCurrentLineNumber(XML_Parser parser);
+XMLPARSEAPI(XML_Size) XML_GetCurrentColumnNumber(XML_Parser parser);
+XMLPARSEAPI(XML_Index) XML_GetCurrentByteIndex(XML_Parser parser);
 
 /* Return the number of bytes in the current event.
    Returns 0 if the event is in an internal entity.

Index: expat_external.h
===================================================================
RCS file: /cvsroot/expat/expat/lib/expat_external.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- expat_external.h	26 Nov 2004 00:20:21 -0000	1.3
+++ expat_external.h	23 Dec 2005 14:45:27 -0000	1.4
@@ -94,6 +94,14 @@
 typedef char XML_LChar;
 #endif /* XML_UNICODE */
 
+#ifdef XML_LARGE_SIZE  /* Use large integers for counts and positions. */
+typedef long long XML_Index;
+typedef unsigned long long XML_Size;
+#else
+typedef long XML_Index;
+typedef unsigned long XML_Size;
+#endif /* XML_LARGE_SIZE */
+
 #ifdef __cplusplus
 }
 #endif

Index: xmlparse.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -d -r1.150 -r1.151
--- xmlparse.c	28 Nov 2005 20:02:36 -0000	1.150
+++ xmlparse.c	23 Dec 2005 14:45:27 -0000	1.151
@@ -458,7 +458,7 @@
   char *m_bufferEnd;
   /* allocated end of buffer */
   const char *m_bufferLim;
-  long m_parseEndByteIndex;
+  XML_Index m_parseEndByteIndex;
   const char *m_parseEndPtr;
   XML_Char *m_dataBuf;
   XML_Char *m_dataBufEnd;
@@ -1751,7 +1751,7 @@
   return errorCode;
 }
 
-long XMLCALL
+XML_Index XMLCALL
 XML_GetCurrentByteIndex(XML_Parser parser)
 {
   if (eventPtr)
@@ -1780,7 +1780,7 @@
   return (char *) 0;
 }
 
-int XMLCALL
+XML_Size XMLCALL
 XML_GetCurrentLineNumber(XML_Parser parser)
 {
   if (eventPtr && eventPtr >= positionPtr) {
@@ -1790,7 +1790,7 @@
   return position.lineNumber + 1;
 }
 
-int XMLCALL
+XML_Size XMLCALL
 XML_GetCurrentColumnNumber(XML_Parser parser)
 {
   if (eventPtr && eventPtr >= positionPtr) {

Index: xmltok.h
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmltok.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- xmltok.h	26 Mar 2004 14:24:11 -0000	1.10
+++ xmltok.h	23 Dec 2005 14:45:27 -0000	1.11
@@ -111,8 +111,8 @@
 
 typedef struct position {
   /* first line and first column are 0 not 1 */
-  unsigned long lineNumber;
-  unsigned long columnNumber;
+  XML_Size lineNumber;
+  XML_Size columnNumber;
 } POSITION;
 
 typedef struct {


From kwaclaw at users.sourceforge.net  Fri Dec 23 15:45:34 2005
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Fri, 23 Dec 2005 15:45:34 +0100 (CET)
Subject: [Expat-checkins] expat Changes,1.45,1.46
Message-ID: <20051223144534.0880E1E4002@bag.python.org>

Update of /cvsroot/expat/expat
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22010

Modified Files:
	Changes 
Log Message:
Added support for 64-bit integers when reporting byte indexes,
line and column numbers. Can be turned on/off using the
XML_LARGE_SIZE switch.

Index: Changes
===================================================================
RCS file: /cvsroot/expat/expat/Changes,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- Changes	27 Nov 2005 21:50:47 -0000	1.45
+++ Changes	23 Dec 2005 14:45:27 -0000	1.46
@@ -1,8 +1,10 @@
-Release 1.95.9 TBD
+Release 2.0 TBD
         - We no longer use the "check" library for C unit testing; we
           always use the (partial) internal implementation of the API.
         - Report XML_NS setting via XML_GetFeatureList().
         - Fixed headers for use from C++.
+        - Added XML_LARGE_SIZE switch to enable 64bit values for
+          byte indexes and line/column numbers.
         - Updated to use libtool 1.5.10 (the most recent).
         - Added support for AmigaOS.
         - Some mostly minor bug fixes. SF issues include: 1006708,


From kwaclaw at users.sourceforge.net  Fri Dec 23 17:47:29 2005
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Fri, 23 Dec 2005 17:47:29 +0100 (CET)
Subject: [Expat-checkins] htdocs index.html,1.57,1.58
Message-ID: <20051223164729.7C6881E4002@bag.python.org>

Update of /cvsroot/expat/htdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14643

Modified Files:
	index.html 
Log Message:
New pre-release snapshot for Expat 2.0.

Index: index.html
===================================================================
RCS file: /cvsroot/expat/htdocs/index.html,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- index.html	29 Jan 2005 03:18:02 -0000	1.57
+++ index.html	23 Dec 2005 16:47:23 -0000	1.58
@@ -51,6 +51,20 @@
 <h3 id="news">News</h3>
 
 <dl>
+  <dt><em>23 December 2005</em>,
+      Expat 2.0 pre-release snapshot (another one) made available.
+    </dt>
+  <dd>
+    <p>As nothing happened here for a long time, we've posted another
+    <a href="http://www.libexpat.org/expat-2005-12-23.tar.gz" >pre-release
+    distribution snapshot</a> of the code currently in CVS on
+    libexpat.org.  Please try this out and report any problems you
+    have. We'd like to get Expat 2.0 out soon.</p>
+    <p>A late addition was the new (optional) <code>XML_LARGE_SIZE</code>
+    feature to enable 64-bit integers on some API members. Please check
+    how it builds and works for you.</p>
+    </dd>
+
   <dt><em>28 January 2005</em>,
       Expat pre-release snapshot made available.
     </dt>
@@ -59,9 +73,9 @@
     "http://www.libexpat.org/expat-2005-01-28.tar.gz" >pre-release
     distribution snapshot</a> of the code currently in CVS on
     libexpat.org.  Please try this out and report any problems you
-    have.  We'd like to get a release out soon.</p>
+    have. We'd like to get a release out soon.</p>
     <p>The coming release will either be 1.95.9 or 2.0, depending
-    primarily on the response to this snapshot.  If we do decide to
+    primarily on the response to this snapshot. If we do decide to
     make this 1.95.9, then we'll try to follow up with 2.0 in about a
     month.</p>
     </dd>


From kwaclaw at users.sourceforge.net  Fri Dec 23 17:57:59 2005
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Fri, 23 Dec 2005 17:57:59 +0100 (CET)
Subject: [Expat-checkins] expat README,1.28,1.29
Message-ID: <20051223165759.071931E4002@bag.python.org>

Update of /cvsroot/expat/expat
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17011

Modified Files:
	README 
Log Message:
Preparing for release 2.0.

Index: README
===================================================================
RCS file: /cvsroot/expat/expat/README,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- README	27 Jan 2005 06:27:57 -0000	1.28
+++ README	23 Dec 2005 16:57:53 -0000	1.29
@@ -1,5 +1,5 @@
 
-                        Expat, Release 1.95.8
+                        Expat, Release 2.0
 
 This is Expat, a C library for parsing XML, written by James Clark.
 Expat is a stream-oriented XML parser.  This means that you register


From ssolie at users.sourceforge.net  Sat Dec 24 07:32:28 2005
From: ssolie at users.sourceforge.net (Steven Solie)
Date: Sat, 24 Dec 2005 07:32:28 +0100 (CET)
Subject: [Expat-checkins] expat/lib amigaconfig.h,1.1,1.2
Message-ID: <20051224063228.944071E4002@bag.python.org>

Update of /cvsroot/expat/expat/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1288

Modified Files:
	amigaconfig.h 
Log Message:


Index: amigaconfig.h
===================================================================
RCS file: /cvsroot/expat/expat/lib/amigaconfig.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- amigaconfig.h	26 Feb 2005 01:38:13 -0000	1.1
+++ amigaconfig.h	24 Dec 2005 06:32:20 -0000	1.2
@@ -5,31 +5,70 @@
 #define BYTEORDER 4321
 
 /* Define to 1 if you have the `bcopy' function. */
-#define HAVE_BCOPY
+#define HAVE_BCOPY 1
+
+/* Define to 1 if you have the <check.h> header file. */
+#undef HAVE_CHECK_H
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
 
 /* Define to 1 if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H
+#define HAVE_FCNTL_H 1
+
+/* Define to 1 if you have the `getpagesize' function. */
+#undef HAVE_GETPAGESIZE
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
 
 /* Define to 1 if you have the `memmove' function. */
-#define HAVE_MEMMOVE
+#define HAVE_MEMMOVE 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have a working `mmap' system call. */
+#undef HAVE_MMAP
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
 
 /* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
 
 /* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H
+#define HAVE_STRING_H 1
 
 /* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H
+#define HAVE_SYS_STAT_H 1
 
 /* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H
+#define HAVE_SYS_TYPES_H 1
 
 /* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H
+#define HAVE_UNISTD_H 1
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "expat-bugs at mail.libexpat.org"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "expat"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "expat 1.95.8"
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "1.95.8"
 
 /* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS
+#define STDC_HEADERS 1
 
 /* whether byteorder is bigendian */
 #define WORDS_BIGENDIAN
@@ -39,9 +78,19 @@
 #define XML_CONTEXT_BYTES 1024
 
 /* Define to make parameter entity parsing functionality available. */
-#define XML_DTD 1
+#define XML_DTD
 
 /* Define to make XML Namespaces functionality available. */
-#define XML_NS 1
+#define XML_NS
 
-#endif
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
+
+/* Define to `long' if <sys/types.h> does not define. */
+#undef off_t
+
+/* Define to `unsigned' if <sys/types.h> does not define. */
+#undef size_t
+
+
+#endif  /* AMIGACONFIG_H */


From ssolie at users.sourceforge.net  Sat Dec 24 07:33:54 2005
From: ssolie at users.sourceforge.net (Steven Solie)
Date: Sat, 24 Dec 2005 07:33:54 +0100 (CET)
Subject: [Expat-checkins] expat/tests runtests.c,1.60,1.61
Message-ID: <20051224063354.3D3A91E4002@bag.python.org>

Update of /cvsroot/expat/expat/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1666

Modified Files:
	runtests.c 
Log Message:


Index: runtests.c
===================================================================
RCS file: /cvsroot/expat/expat/tests/runtests.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- runtests.c	28 Jan 2005 05:41:56 -0000	1.60
+++ runtests.c	24 Dec 2005 06:33:50 -0000	1.61
@@ -17,6 +17,10 @@
 #include "chardata.h"
 #include "minicheck.h"
 
+#ifdef AMIGA_SHARED_LIB
+#include <proto/expat.h>
+#endif
+
 
 static XML_Parser parser;
 
@@ -1385,8 +1389,13 @@
 }
 
 
+#ifdef AMIGA_SHARED_LIB
+int
+amiga_main(int argc, char *argv[])
+#else
 int
 main(int argc, char *argv[])
+#endif
 {
     int i, nf;
     int forking = 0, forking_set = 0;


From ssolie at users.sourceforge.net  Sat Dec 24 07:34:27 2005
From: ssolie at users.sourceforge.net (Steven Solie)
Date: Sat, 24 Dec 2005 07:34:27 +0100 (CET)
Subject: [Expat-checkins] expat/tests/benchmark benchmark.c,1.1,1.2
Message-ID: <20051224063427.94A1B1E4002@bag.python.org>

Update of /cvsroot/expat/expat/tests/benchmark
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1751

Modified Files:
	benchmark.c 
Log Message:


Index: benchmark.c
===================================================================
RCS file: /cvsroot/expat/expat/tests/benchmark/benchmark.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- benchmark.c	4 Sep 2003 16:01:54 -0000	1.1
+++ benchmark.c	24 Dec 2005 06:34:24 -0000	1.2
@@ -12,7 +12,13 @@
   exit(rc);
 }
 
+#ifdef AMIGA_SHARED_LIB
+#include <proto/expat.h>
+int
+amiga_main(int argc, char *argv[])
+#else
 int main (int argc, char *argv[]) 
+#endif
 {
   XML_Parser  parser;
   char        *XMLBuf, *XMLBufEnd, *XMLBufPtr;


From ssolie at users.sourceforge.net  Sat Dec 24 07:35:08 2005
From: ssolie at users.sourceforge.net (Steven Solie)
Date: Sat, 24 Dec 2005 07:35:08 +0100 (CET)
Subject: [Expat-checkins] expat/xmlwf xmlwf.c,1.67,1.68
Message-ID: <20051224063508.98A011E4002@bag.python.org>

Update of /cvsroot/expat/expat/xmlwf
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1881

Modified Files:
	xmlwf.c 
Log Message:


Index: xmlwf.c
===================================================================
RCS file: /cvsroot/expat/expat/xmlwf/xmlwf.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- xmlwf.c	10 Aug 2004 18:18:25 -0000	1.67
+++ xmlwf.c	24 Dec 2005 06:35:04 -0000	1.68
@@ -16,6 +16,10 @@
 #include <crtdbg.h>
 #endif
 
+#ifdef AMIGA_SHARED_LIB
+#include <proto/expat.h>
+#endif
+
 /* This ensures proper sorting. */
 
 #define NSSEP T('\001')
@@ -634,8 +638,13 @@
   exit(rc);
 }
 
+#ifdef AMIGA_SHARED_LIB
+int
+amiga_main(int argc, char *argv[])
+#else
 int
 tmain(int argc, XML_Char **argv)
+#endif
 {
   int i, j;
   const XML_Char *outputDir = NULL;


From ssolie at users.sourceforge.net  Sat Dec 24 07:35:40 2005
From: ssolie at users.sourceforge.net (Steven Solie)
Date: Sat, 24 Dec 2005 07:35:40 +0100 (CET)
Subject: [Expat-checkins] expat/xmlwf xmlfile.c,1.14,1.15
Message-ID: <20051224063540.1123A1E4013@bag.python.org>

Update of /cvsroot/expat/expat/xmlwf
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1988

Modified Files:
	xmlfile.c 
Log Message:


Index: xmlfile.c
===================================================================
RCS file: /cvsroot/expat/expat/xmlwf/xmlfile.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- xmlfile.c	10 Aug 2004 18:13:47 -0000	1.14
+++ xmlfile.c	24 Dec 2005 06:35:35 -0000	1.15
@@ -23,6 +23,10 @@
 #include <io.h>
 #endif
 
+#ifdef AMIGA_SHARED_LIB
+#include <proto/expat.h>
+#endif
+
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif


From ssolie at users.sourceforge.net  Sat Dec 24 07:38:17 2005
From: ssolie at users.sourceforge.net (Steven Solie)
Date: Sat, 24 Dec 2005 07:38:17 +0100 (CET)
Subject: [Expat-checkins] expat/amiga Makefile,1.1,1.2
Message-ID: <20051224063817.613901E4002@bag.python.org>

Update of /cvsroot/expat/expat/amiga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2325

Modified Files:
	Makefile 
Log Message:


Index: Makefile
===================================================================
RCS file: /cvsroot/expat/expat/amiga/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	26 Feb 2005 01:38:54 -0000	1.1
+++ Makefile	24 Dec 2005 06:38:10 -0000	1.2
@@ -2,117 +2,182 @@
 # Makefile for AmigaOS
 #
 
-.PHONY: help all check clean install uninstall
+.PHONY: help all staticlib sharedlib check clean install
 
-tooldir = SDK:C
-includedir = SDK:Local/clib2/include
-libdir = SDK:Local/clib2/lib
+vpath %.c ../lib ../examples ../xmlwf ../tests
+vpath %.h ../lib ../tests
+
+
+#
+# Set these for SDK installation.
+#
+tooldir = SDK:Local/C
+staticlibdir = SDK:Local/clib2/lib
+staticincludedir = SDK:Local/clib2/include
+sharedlibdir = LIBS:
+sharedincludedir = SDK:Local/common/include
+
+
+ifeq ($(MAKECMDGOALS), staticlib)
+ DESTDIR = lib
+else
+ DESTDIR = libs
+endif
+
+STATICLIB = $(DESTDIR)/libexpat.a
+SHAREDLIB = $(DESTDIR)/expat.library
+
+XMLWF = $(DESTDIR)/xmlwf
+ELEMENTS = $(DESTDIR)/elements
+OUTLINE = $(DESTDIR)/outline
+RUNTESTS = $(DESTDIR)/runtests
+BENCHMARK = $(DESTDIR)/benchmark
 
-LIBRARY = libexpat.a
 
 help:
-	@echo "Expat XML Parser"
-	@echo ""
-	@echo "Requirements:"
-	@echo "- AmigaOS 4.0"
-	@echo "- SDK 51.5"
-	@echo "- clib2 1.188"
+	@echo "Requires:"
+	@echo " AmigaOS 4.0"
+	@echo " SDK 51.15"
+	@echo " clib2 1.198"
 	@echo ""
 	@echo "Targets:"
-	@echo "all - build expat lib, all tools, test suite and run tests"
-	@echo "check - run test suite"
-	@echo "clean - clean all product files"
-	@echo "install - install expat lib and headers in SDK"
-	@echo "uninstall - uninstall expat lib and headers"
+	@echo " all     - make expat libraries, xmlwf, examples and run test suite"
+	@echo " install - install expat libraries and tools into SDK"
 
-all: $(LIBRARY) xmlwf elements outline check benchmark
+all:
+	$(MAKE) staticlib
+	$(MAKE) sharedlib
 
-check: runtests
-	runtests
+staticlib: $(STATICLIB) $(XMLWF) $(ELEMENTS) $(OUTLINE) $(RUNTESTS) $(BENCHMARK) check
+	@echo done
+
+sharedlib: $(SHAREDLIB) $(XMLWF) $(ELEMENTS) $(OUTLINE) $(RUNTESTS) $(BENCHMARK) check
+	@echo done
+
+check:
+	$(RUNTESTS)
 
 clean:
-	-delete /lib/#?.o quiet
-	-delete /xmlwf/#?.o quiet
-	-delete /examples/#?.o quiet
-	-delete /tests/#?.o quiet
-	-delete $(LIBRARY) xmlwf runtests elements outline benchmark quiet
+	-delete lib/#?.o quiet
+	-delete libs/#?.o quiet
 
-install: xmlwf $(LIBRARY)
-	copy xmlwf $(tooldir) quiet
-	copy /lib/expat.h /lib/expat_external.h $(includedir) quiet
-	copy $(LIBRARY) $(libdir) quiet
+install:
+	copy lib/xmlwf $(tooldir) quiet
+	copy /lib/expat.h /lib/expat_external.h $(staticincludedir) quiet
+	copy lib/libexpat.a $(staticlibdir) quiet
+	copy libs/expat.library $(sharedlibdir) quiet
+	copy include $(sharedincludedir) quiet all
 
-uninstall:
-	-delete $(tooldir)/xmlwf quiet
-	-delete $(includedir)/expat.h $(includedir)/expat_external.h quiet
-	-delete $(libdir)/$(LIBRARY) quiet
 
 CC = gcc
 LIBTOOL = ar
 STRIP = strip
-LIBDIR = /lib
 
-INCLUDES = -I../lib
 LDFLAGS =
+LIBS =
 CFLAGS = -DNDEBUG -O2
 LTFLAGS = -crs
 STRIPFLAGS = -R.comment
+LAUNCH =
 
-COMPILE = $(CC) $(CFLAGS) $(INCLUDES)
+ifeq ($(MAKECMDGOALS), staticlib)
+ LIBS += $(STATICLIB)
+ INCLUDES = -I../lib
+endif
 
-LINK_LIB = $(LIBTOOL) $(LTFLAGS)
+ifeq ($(MAKECMDGOALS), sharedlib)
+ CFLAGS += -DAMIGA_SHARED_LIB -D__USE_INLINE__
+ INCLUDES = -I. -Iinclude -Iinclude/libraries
+ LAUNCH = $(DESTDIR)/launch.o
+endif
 
-LINK_EXE = $(COMPILE) $(LDFLAGS) -o $@
 
-LIB_OBJS = $(LIBDIR)/xmlparse.o $(LIBDIR)/xmltok.o $(LIBDIR)/xmlrole.o
-LIB_LINK_OBJS = $(subst $(LIBDIR),..$(LIBDIR),$(LIB_OBJS))
-$(LIBRARY): $(LIB_OBJS)
-	$(LINK_LIB) $@ $(LIB_LINK_OBJS)
+COMPILE = $(CC) $(CFLAGS) $(INCLUDES) -c
 
-$(LIBDIR)/xmlparse.o: $(LIBDIR)/xmlparse.c $(LIBDIR)/expat.h \
-	$(LIBDIR)/xmlrole.h $(LIBDIR)/xmltok.h $(LIBDIR)/expat_external.h \
-	$(LIBDIR)/internal.h $(LIBDIR)/amigaconfig.h
+LINK = $(CC) $(LDFLAGS) -o $@
 
-$(LIBDIR)/xmlrole.o: $(LIBDIR)/xmlrole.c $(LIBDIR)/ascii.h \
-	$(LIBDIR)/xmlrole.h $(LIBDIR)/expat_external.h $(LIBDIR)/internal.h \
-	$(LIBDIR)/amigaconfig.h
 
-$(LIBDIR)/xmltok.o: $(LIBDIR)/xmltok.c $(LIBDIR)/xmltok_impl.c \
-	$(LIBDIR)/xmltok_ns.c $(LIBDIR)/ascii.h $(LIBDIR)/asciitab.h \
-	$(LIBDIR)/iasciitab.h $(LIBDIR)/latin1tab.h $(LIBDIR)/nametab.h \
-	$(LIBDIR)/utf8tab.h $(LIBDIR)/xmltok.h $(LIBDIR)/xmltok_impl.h \
-	$(LIBDIR)/expat_external.h $(LIBDIR)/internal.h $(LIBDIR)/amigaconfig.h
+$(STATICLIB): $(DESTDIR)/xmlparse.o $(DESTDIR)/xmltok.o $(DESTDIR)/xmlrole.o
+	$(LIBTOOL) $(LTFLAGS) $@ $^
 
-XMLWF_OBJS = /xmlwf/xmlwf.o /xmlwf/xmlfile.o /xmlwf/codepage.o /xmlwf/readfilemap.o
-XMLWF_LINK_OBJS = $(subst /xmlwf/,../xmlwf/,$(XMLWF_OBJS))
-/xmlwf/xmlwf.o: /xmlwf/xmlwf.c
-/xmlwf/xmlfile.o: /xmlwf/xmlfile.c
-/xmlwf/codepage.o: /xmlwf/codepage.c
-/xmlwf/readfilemap.o: /xmlwf/readfilemap.c
-xmlwf: $(XMLWF_OBJS) $(LIBRARY)
-	$(LINK_EXE) $(XMLWF_LINK_OBJS) $(LIBRARY) -lm
-	$(STRIP) $(STRIPFLAGS) $@
+$(DESTDIR)/xmlparse.o: xmlparse.c expat.h xmlrole.h xmltok.h \
+	expat_external.h internal.h amigaconfig.h
+	$(COMPILE) $< -o $@
 
-/examples/elements.o: /examples/elements.c
-elements: /examples/elements.o $(LIBRARY)
-	$(LINK_EXE) ../examples/elements.o $(LIBRARY) -lm
+$(DESTDIR)/xmlrole.o: xmlrole.c ascii.h xmlrole.h expat_external.h \
+	internal.h amigaconfig.h
+	$(COMPILE) $< -o $@
+
+$(DESTDIR)/xmltok.o: xmltok.c xmltok_impl.c xmltok_ns.c ascii.h asciitab.h \
+	iasciitab.h latin1tab.h nametab.h utf8tab.h xmltok.h xmltok_impl.h \
+	expat_external.h internal.h amigaconfig.h
+	$(COMPILE) $< -o $@
+
+
+$(SHAREDLIB): $(DESTDIR)/expat_lib.o $(DESTDIR)/expat_vectors.o $(DESTDIR)/stdlib.o lib/libexpat.a
+	$(LINK) -nostartfiles -nostdlib -o $@ $^
+
+$(DESTDIR)/expat_lib.o: expat_lib.c
+	$(COMPILE) $< -o $@
+
+$(DESTDIR)/expat_vectors.o: expat_vectors.c
+	$(COMPILE) $< -o $@
+
+$(DESTDIR)/stdlib.o: stdlib.c
+	$(COMPILE) $< -o $@
+
+$(LAUNCH): launch.c
+	$(COMPILE) $< -o $@
+
+
+$(XMLWF): $(DESTDIR)/xmlwf.o $(DESTDIR)/xmlfile.o $(DESTDIR)/codepage.o $(DESTDIR)/readfilemap.o $(LAUNCH)
+	$(LINK) $^ $(LIBS)
 	$(STRIP) $(STRIPFLAGS) $@
 
-/examples/outline.o: /examples/outline.c
-outline: /examples/outline.o $(LIBRARY)
-	$(LINK_EXE) ../examples/outline.o $(LIBRARY) -lm
+$(DESTDIR)/xmlwf.o: xmlwf.c
+	$(COMPILE) $< -o $@
+
+$(DESTDIR)/xmlfile.o: xmlfile.c
+	$(COMPILE) $< -o $@
+
+$(DESTDIR)/codepage.o: codepage.c
+	$(COMPILE) $< -o $@
+
+$(DESTDIR)/readfilemap.o: readfilemap.c
+	$(COMPILE) $< -o $@
+
+
+$(ELEMENTS): $(DESTDIR)/elements.o $(LAUNCH)
+	$(LINK) $^ $(LIBS)
 	$(STRIP) $(STRIPFLAGS) $@
 
-/tests/benchmark/benchmark.o: /tests/benchmark/benchmark.c
-benchmark: /tests/benchmark/benchmark.o $(LIBRARY)
-	$(LINK_EXE) ../tests/benchmark/benchmark.o $(LIBRARY) -lm
+$(DESTDIR)/elements.o: elements.c
+	$(COMPILE) $< -o $@
+
+
+$(OUTLINE): $(DESTDIR)/outline.o $(LAUNCH)
+	$(LINK) $^ $(LIBS)
 	$(STRIP) $(STRIPFLAGS) $@
 
-/tests/chardata.o: /tests/chardata.c /tests/chardata.h
-/tests/minicheck.o: /tests/minicheck.c /tests/minicheck.h
-/tests/runtests.o: /tests/runtests.c /tests/chardata.h
-runtests: /tests/runtests.o /tests/chardata.o /tests/minicheck.o $(LIBRARY)
-	$(LINK_EXE) ../tests/runtests.o ../tests/chardata.o ../tests/minicheck.o $(LIBRARY) -lm
+$(DESTDIR)/outline.o: outline.c
+	$(COMPILE) $< -o $@
 
-%.o: %.c
-	$(COMPILE) -o ..$@ -c ..$<
+
+$(RUNTESTS): $(DESTDIR)/runtests.o $(DESTDIR)/chardata.o $(DESTDIR)/minicheck.o $(LAUNCH)
+	$(LINK) $^ $(LIBS)
+
+$(DESTDIR)/chardata.o: chardata.c chardata.h
+	$(COMPILE) $< -o $@
+
+$(DESTDIR)/minicheck.o: minicheck.c minicheck.h
+	$(COMPILE) $< -o $@
+
+$(DESTDIR)/runtests.o: runtests.c chardata.h
+	$(COMPILE) $< -o $@
+
+
+$(BENCHMARK): $(DESTDIR)/benchmark.o $(LAUNCH)
+	$(LINK) $^ $(LIBS) -lm
+
+$(DESTDIR)/benchmark.o: benchmark/benchmark.c
+	$(COMPILE) $< -o $@


From ssolie at users.sourceforge.net  Sat Dec 24 07:38:34 2005
From: ssolie at users.sourceforge.net (Steven Solie)
Date: Sat, 24 Dec 2005 07:38:34 +0100 (CET)
Subject: [Expat-checkins] expat/amiga README.txt,1.1,1.2
Message-ID: <20051224063834.020271E4002@bag.python.org>

Update of /cvsroot/expat/expat/amiga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2358

Modified Files:
	README.txt 
Log Message:


Index: README.txt
===================================================================
RCS file: /cvsroot/expat/expat/amiga/README.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- README.txt	26 Feb 2005 01:38:54 -0000	1.1
+++ README.txt	24 Dec 2005 06:38:30 -0000	1.2
@@ -1,36 +1,53 @@
-Short:    Expat XML parsing library
-Author:   James Clark
-Uploader: ssolie at telus.net (Steven Solie)
-Type:     dev/misc
-Version:  1.95.8
-Requires: AmigaOS 4.0, SDK 51.5, clib2 1.188
+SUMMARY
+=======
+This is a port of expat for AmigaOS 4.0 which includes the
+SDK, some XML tools and the libraries.
 
-This is a port of expat for AmigaOS 4.0 PPC.
+Both static and shared library versions are supported.
 
-Currently clib2 is supported although it should be possible to use
-the library with newlib (e.g. add the -newlib option to GCC).
+The static library version is limited to clib2 although it should
+be possible to use newlib with the appopriate compile options.
 
+The shared library version is based on the work of Fredrik Wikstrom
+and is currently limited to PPC only.
 
-Building:
----------
-To build expat library, xmlwf tool, examples and run the test suite,
-simply type 'make all'.
 
-To install expat into the AmigaOS SDK type 'make install'.
+HISTORY
+=======
+3.1  - removed obsolete sfd file
+     - added library description xml file
+     - refactored Makefile
+     - removed extraneous VARARGS68K keywords
+     - reworked default memory handling functions in shared lib
+     - updated amigaconfig.h
 
-To uninstall expat, type 'make uninstall'.
+3.0  - initial release
+     - based on expat 1.95.8
 
-To run the test suite, type 'make check'.
 
+BUILDING
+========
+To build expat.library, xmlwf tool, examples and run the test suite,
+simply type 'make all' in the amiga subdirectory.
 
-Configuration:
---------------
-You may want to edit the lib/amigaconfig.h file to remove DTD and/or
-XML namespace support if they are not required by your application
-for a slightly smaller and faster implementation.
+The test suite will compile and run for both the static and shared
+library versions.
 
 
-To Do:
-------
+INSTALLATION
+============
+To install both static and shared versions of expat into the
+AmigaOS SDK type 'make install' in the amiga subdirectory.
+
+
+CONFIGURATION
+=============
+You may want to edit the lib/amigaconfig.h file to remove
+DTD and/or XML namespace support if they are not required by your
+specific application for a smaller and faster implementation.
+
+
+TO DO
+=====
 - wide character support (UTF-16)
-- create a shared library option
+- provide 68k backwards compatibility


From ssolie at users.sourceforge.net  Sat Dec 24 07:40:00 2005
From: ssolie at users.sourceforge.net (Steven Solie)
Date: Sat, 24 Dec 2005 07:40:00 +0100 (CET)
Subject: [Expat-checkins] expat/amiga stdlib.c, NONE, 1.1 expat_vectors.c,
	NONE, 1.1 expat.xml, NONE, 1.1 expat_lib.c, NONE, 1.1 launch.c,
	NONE, 1.1
Message-ID: <20051224064000.62FE71E4002@bag.python.org>

Update of /cvsroot/expat/expat/amiga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2497

Added Files:
	stdlib.c expat_vectors.c expat.xml expat_lib.c launch.c 
Log Message:


--- NEW FILE: stdlib.c ---
/*
** Copyright (c) 2001-2005 Expat maintainers.
**
** Permission is hereby granted, free of charge, to any person obtaining
** a copy of this software and associated documentation files (the
** "Software"), to deal in the Software without restriction, including
** without limitation the rights to use, copy, modify, merge, publish,
** distribute, sublicense, and/or sell copies of the Software, and to
** permit persons to whom the Software is furnished to do so, subject to
** the following conditions:
** 
** The above copyright notice and this permission notice shall be included
** in all copies or substantial portions of the Software.
** 
** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
** SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

#include <stdlib.h>
#include <exec/memory.h>
#include <proto/exec.h>
#include <proto/utility.h>

void * malloc (size_t len)
{
	uint32 size = sizeof(uint32) + len;

	uint32 *mem = AllocMem(size, MEMF_ANY);
	if ( mem != 0 )  {
		*mem = size;
		++mem;
	}

	return mem;
}


void * realloc (void * mem, size_t len2)
{
	if ( mem == 0 )  {
		return malloc(len2);
	}

	if ( len2 == 0 )  {
		free(mem);
		return 0;
	}

	void * new_mem = malloc(len2);
	if ( new_mem == 0 )  {
		return 0;
	}

	uint32 mem_size = *(((uint32*)mem) - 1);
	CopyMem(mem, new_mem, mem_size);
	free(mem);

	return new_mem;
}


void free (void * mem)
{
	if ( mem != 0 )  {
		uint32 size = *(((uint32*)mem) - 1);
		FreeMem(mem, size);
	}
}


int memcmp (const void * a, const void * b, size_t len)
{
	size_t i;
	int diff;

	for ( i = 0; i < len; ++i )  {
		diff = *((uint8 *)a++) - *((uint8 *)b++);
		if ( diff )  {
			return diff;
		}
	}

	return 0;
}


void * memcpy (void * t, const void * a, size_t len)
{
	CopyMem((APTR)a, t, len);
	return t;
}


void * memmove (void * t1, const void * t2, size_t len)
{
	MoveMem((APTR)t2, t1, len);
	return t1;
}


void * memset (void * t, int c, size_t len)
{
	return SetMem(t, c, len);
}

--- NEW FILE: expat_vectors.c ---
/*
** Copyright (c) 2001-2005 Expat maintainers.
**
** Permission is hereby granted, free of charge, to any person obtaining
** a copy of this software and associated documentation files (the
** "Software"), to deal in the Software without restriction, including
** without limitation the rights to use, copy, modify, merge, publish,
** distribute, sublicense, and/or sell copies of the Software, and to
** permit persons to whom the Software is furnished to do so, subject to
** the following conditions:
** 
** The above copyright notice and this permission notice shall be included
** in all copies or substantial portions of the Software.
** 
** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
** SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

#include <exec/types.h>
#include <exec/exec.h>
#include <exec/interfaces.h>
#include <interfaces/expat.h>

extern uint32                _Expat_Obtain(struct ExpatIFace *);
extern uint32                _Expat_Release(struct ExpatIFace *);
extern XML_Parser            _Expat_XML_ParserCreate(struct ExpatIFace *, const XML_Char * encodingName);
extern XML_Parser            _Expat_XML_ParserCreateNS(struct ExpatIFace *, const XML_Char * encodingName, XML_Char nsSep);
extern XML_Parser            _Expat_XML_ParserCreate_MM(struct ExpatIFace *, const XML_Char * encoding, const XML_Memory_Handling_Suite * memsuite, const XML_Char * namespaceSeparator);
extern XML_Parser            _Expat_XML_ExternalEntityParserCreate(struct ExpatIFace *, XML_Parser parser, const XML_Char * context, const XML_Char * encoding);
extern void                  _Expat_XML_ParserFree(struct ExpatIFace *, XML_Parser parser);
extern enum XML_Status       _Expat_XML_Parse(struct ExpatIFace *, XML_Parser parser, const char * s, int len, int isFinal);
extern enum XML_Status       _Expat_XML_ParseBuffer(struct ExpatIFace *, XML_Parser parser, int len, int isFinal);
extern void *                _Expat_XML_GetBuffer(struct ExpatIFace *, XML_Parser parser, int len);
extern void                  _Expat_XML_SetStartElementHandler(struct ExpatIFace *, XML_Parser parser, XML_StartElementHandler start);
extern void                  _Expat_XML_SetEndElementHandler(struct ExpatIFace *, XML_Parser parser, XML_EndElementHandler end);
extern void                  _Expat_XML_SetElementHandler(struct ExpatIFace *, XML_Parser parser, XML_StartElementHandler start, XML_EndElementHandler end);
extern void                  _Expat_XML_SetCharacterDataHandler(struct ExpatIFace *, XML_Parser parser, XML_CharacterDataHandler handler);
extern void                  _Expat_XML_SetProcessingInstructionHandler(struct ExpatIFace *, XML_Parser parser, XML_ProcessingInstructionHandler handler);
extern void                  _Expat_XML_SetCommentHandler(struct ExpatIFace *, XML_Parser parser, XML_CommentHandler handler);
extern void                  _Expat_XML_SetStartCdataSectionHandler(struct ExpatIFace *, XML_Parser parser, XML_StartCdataSectionHandler start);
extern void                  _Expat_XML_SetEndCdataSectionHandler(struct ExpatIFace *, XML_Parser parser, XML_EndCdataSectionHandler end);
extern void                  _Expat_XML_SetCdataSectionHandler(struct ExpatIFace *, XML_Parser parser, XML_StartCdataSectionHandler start, XML_EndCdataSectionHandler end);
extern void                  _Expat_XML_SetDefaultHandler(struct ExpatIFace *, XML_Parser parser, XML_DefaultHandler handler);
extern void                  _Expat_XML_SetDefaultHandlerExpand(struct ExpatIFace *, XML_Parser parser, XML_DefaultHandler handler);
extern void                  _Expat_XML_SetExternalEntityRefHandler(struct ExpatIFace *, XML_Parser parser, XML_ExternalEntityRefHandler handler);
extern void                  _Expat_XML_SetExternalEntityRefHandlerArg(struct ExpatIFace *, XML_Parser parser, void * arg);
extern void                  _Expat_XML_SetUnknownEncodingHandler(struct ExpatIFace *, XML_Parser parser, XML_UnknownEncodingHandler handler, void * data);
extern void                  _Expat_XML_SetStartNamespaceDeclHandler(struct ExpatIFace *, XML_Parser parser, XML_StartNamespaceDeclHandler start);
extern void                  _Expat_XML_SetEndNamespaceDeclHandler(struct ExpatIFace *, XML_Parser parser, XML_EndNamespaceDeclHandler end);
extern void                  _Expat_XML_SetNamespaceDeclHandler(struct ExpatIFace *, XML_Parser parser, XML_StartNamespaceDeclHandler start, XML_EndNamespaceDeclHandler end);
extern void                  _Expat_XML_SetXmlDeclHandler(struct ExpatIFace *, XML_Parser parser, XML_XmlDeclHandler handler);
extern void                  _Expat_XML_SetStartDoctypeDeclHandler(struct ExpatIFace *, XML_Parser parser, XML_StartDoctypeDeclHandler start);
extern void                  _Expat_XML_SetEndDoctypeDeclHandler(struct ExpatIFace *, XML_Parser parser, XML_EndDoctypeDeclHandler end);
extern void                  _Expat_XML_SetDoctypeDeclHandler(struct ExpatIFace *, XML_Parser parser, XML_StartDoctypeDeclHandler start, XML_EndDoctypeDeclHandler end);
extern void                  _Expat_XML_SetElementDeclHandler(struct ExpatIFace *, XML_Parser parser, XML_ElementDeclHandler eldecl);
extern void                  _Expat_XML_SetAttlistDeclHandler(struct ExpatIFace *, XML_Parser parser, XML_AttlistDeclHandler attdecl);
extern void                  _Expat_XML_SetEntityDeclHandler(struct ExpatIFace *, XML_Parser parser, XML_EntityDeclHandler handler);
extern void                  _Expat_XML_SetUnparsedEntityDeclHandler(struct ExpatIFace *, XML_Parser parser, XML_UnparsedEntityDeclHandler handler);
extern void                  _Expat_XML_SetNotationDeclHandler(struct ExpatIFace *, XML_Parser parser, XML_NotationDeclHandler handler);
extern void                  _Expat_XML_SetNotStandaloneHandler(struct ExpatIFace *, XML_Parser parser, XML_NotStandaloneHandler handler);
extern enum XML_Error        _Expat_XML_GetErrorCode(struct ExpatIFace *, XML_Parser parser);
extern const XML_LChar *     _Expat_XML_ErrorString(struct ExpatIFace *, enum XML_Error code);
extern long                  _Expat_XML_GetCurrentByteIndex(struct ExpatIFace *, XML_Parser parser);
extern int                   _Expat_XML_GetCurrentLineNumber(struct ExpatIFace *, XML_Parser parser);
extern int                   _Expat_XML_GetCurrentColumnNumber(struct ExpatIFace *, XML_Parser parser);
extern int                   _Expat_XML_GetCurrentByteCount(struct ExpatIFace *, XML_Parser parser);
extern const char *          _Expat_XML_GetInputContext(struct ExpatIFace *, XML_Parser parser, int * offset, int * size);
extern void                  _Expat_XML_SetUserData(struct ExpatIFace *, XML_Parser parser, void * userData);
extern void                  _Expat_XML_DefaultCurrent(struct ExpatIFace *, XML_Parser parser);
extern void                  _Expat_XML_UseParserAsHandlerArg(struct ExpatIFace *, XML_Parser parser);
extern enum XML_Status       _Expat_XML_SetBase(struct ExpatIFace *, XML_Parser parser, const XML_Char * base);
extern const XML_Char *      _Expat_XML_GetBase(struct ExpatIFace *, XML_Parser parser);
extern int                   _Expat_XML_GetSpecifiedAttributeCount(struct ExpatIFace *, XML_Parser parser);
extern int                   _Expat_XML_GetIdAttributeIndex(struct ExpatIFace *, XML_Parser parser);
extern enum XML_Status       _Expat_XML_SetEncoding(struct ExpatIFace *, XML_Parser parser, const XML_Char * encoding);
extern int                   _Expat_XML_SetParamEntityParsing(struct ExpatIFace *, XML_Parser parser, enum XML_ParamEntityParsing parsing);
extern void                  _Expat_XML_SetReturnNSTriplet(struct ExpatIFace *, XML_Parser parser, int do_nst);
extern const XML_LChar *     _Expat_XML_ExpatVersion(struct ExpatIFace *);
extern XML_Expat_Version     _Expat_XML_ExpatVersionInfo(struct ExpatIFace *);
extern XML_Bool              _Expat_XML_ParserReset(struct ExpatIFace *, XML_Parser parser, const XML_Char * encoding);
extern void                  _Expat_XML_SetSkippedEntityHandler(struct ExpatIFace *, XML_Parser parser, XML_SkippedEntityHandler handler);
extern enum XML_Error        _Expat_XML_UseForeignDTD(struct ExpatIFace *, XML_Parser parser, XML_Bool useDTD);
extern const XML_Feature *   _Expat_XML_GetFeatureList(struct ExpatIFace *);
extern enum XML_Status       _Expat_XML_StopParser(struct ExpatIFace *, XML_Parser parser, XML_Bool resumable);
extern enum XML_Status       _Expat_XML_ResumeParser(struct ExpatIFace *, XML_Parser parser);
extern void                  _Expat_XML_GetParsingStatus(struct ExpatIFace *, XML_Parser parser, XML_ParsingStatus * status);
extern void                  _Expat_XML_FreeContentModel(struct ExpatIFace *, XML_Parser parser, XML_Content * model);
extern void *                _Expat_XML_MemMalloc(struct ExpatIFace *, XML_Parser parser, size_t size);
extern void *                _Expat_XML_MemRealloc(struct ExpatIFace *, XML_Parser parser, void * ptr, size_t size);
extern void                  _Expat_XML_MemFree(struct ExpatIFace *, XML_Parser parser, void * ptr);


CONST APTR main_vectors[] =
{
    _Expat_Obtain,
    _Expat_Release,
    NULL,
    NULL,
    _Expat_XML_ParserCreate,
    _Expat_XML_ParserCreateNS,
    _Expat_XML_ParserCreate_MM,
    _Expat_XML_ExternalEntityParserCreate,
    _Expat_XML_ParserFree,
    _Expat_XML_Parse,
    _Expat_XML_ParseBuffer,
    _Expat_XML_GetBuffer,
    _Expat_XML_SetStartElementHandler,
    _Expat_XML_SetEndElementHandler,
    _Expat_XML_SetElementHandler,
    _Expat_XML_SetCharacterDataHandler,
    _Expat_XML_SetProcessingInstructionHandler,
    _Expat_XML_SetCommentHandler,
    _Expat_XML_SetStartCdataSectionHandler,
    _Expat_XML_SetEndCdataSectionHandler,
    _Expat_XML_SetCdataSectionHandler,
    _Expat_XML_SetDefaultHandler,
    _Expat_XML_SetDefaultHandlerExpand,
    _Expat_XML_SetExternalEntityRefHandler,
    _Expat_XML_SetExternalEntityRefHandlerArg,
    _Expat_XML_SetUnknownEncodingHandler,
    _Expat_XML_SetStartNamespaceDeclHandler,
    _Expat_XML_SetEndNamespaceDeclHandler,
    _Expat_XML_SetNamespaceDeclHandler,
    _Expat_XML_SetXmlDeclHandler,
    _Expat_XML_SetStartDoctypeDeclHandler,
    _Expat_XML_SetEndDoctypeDeclHandler,
    _Expat_XML_SetDoctypeDeclHandler,
    _Expat_XML_SetElementDeclHandler,
    _Expat_XML_SetAttlistDeclHandler,
    _Expat_XML_SetEntityDeclHandler,
    _Expat_XML_SetUnparsedEntityDeclHandler,
    _Expat_XML_SetNotationDeclHandler,
    _Expat_XML_SetNotStandaloneHandler,
    _Expat_XML_GetErrorCode,
    _Expat_XML_ErrorString,
    _Expat_XML_GetCurrentByteIndex,
    _Expat_XML_GetCurrentLineNumber,
    _Expat_XML_GetCurrentColumnNumber,
    _Expat_XML_GetCurrentByteCount,
    _Expat_XML_GetInputContext,
    _Expat_XML_SetUserData,
    _Expat_XML_DefaultCurrent,
    _Expat_XML_UseParserAsHandlerArg,
    _Expat_XML_SetBase,
    _Expat_XML_GetBase,
    _Expat_XML_GetSpecifiedAttributeCount,
    _Expat_XML_GetIdAttributeIndex,
    _Expat_XML_SetEncoding,
    _Expat_XML_SetParamEntityParsing,
    _Expat_XML_SetReturnNSTriplet,
    _Expat_XML_ExpatVersion,
    _Expat_XML_ExpatVersionInfo,
    _Expat_XML_ParserReset,
    _Expat_XML_SetSkippedEntityHandler,
    _Expat_XML_UseForeignDTD,
    _Expat_XML_GetFeatureList,
    _Expat_XML_StopParser,
    _Expat_XML_ResumeParser,
    _Expat_XML_GetParsingStatus,
    _Expat_XML_FreeContentModel,
    _Expat_XML_MemMalloc,
    _Expat_XML_MemRealloc,
    _Expat_XML_MemFree,
    (APTR)-1
};

uint32 _Expat_Obtain(struct ExpatIFace *Self)
{
	return ++Self->Data.RefCount;
}

uint32 _Expat_Release(struct ExpatIFace *Self)
{
	return --Self->Data.RefCount;
}

XML_Parser _Expat_XML_ParserCreate(struct ExpatIFace * Self, const XML_Char *encoding)
{
	return XML_ParserCreate(encoding);
}

XML_Parser _Expat_XML_ParserCreateNS(struct ExpatIFace * Self, const XML_Char *encoding, XML_Char nsSep)
{
	return XML_ParserCreateNS(encoding, nsSep);
}

XML_Parser _Expat_XML_ParserCreate_MM(struct ExpatIFace * Self, const XML_Char *encoding, const XML_Memory_Handling_Suite *memsuite, const XML_Char *namespaceSeparator)
{
	return XML_ParserCreate_MM(encoding, memsuite, namespaceSeparator);
}

XML_Parser _Expat_XML_ExternalEntityParserCreate(struct ExpatIFace * Self, XML_Parser parser, const XML_Char *context, const XML_Char *encoding)
{
	return XML_ExternalEntityParserCreate(parser, context, encoding);
}

void _Expat_XML_ParserFree(struct ExpatIFace *Self, XML_Parser parser)
{
	XML_ParserFree(parser);
}

enum XML_Status _Expat_XML_Parse(struct ExpatIFace * Self, XML_Parser parser, const char * s, int len, int isFinal)
{
	return XML_Parse(parser, s, len, isFinal);
}

enum XML_Status _Expat_XML_ParseBuffer(struct ExpatIFace * Self, XML_Parser parser, int len, int isFinal)
{
	return XML_ParseBuffer(parser, len, isFinal);
}

void * _Expat_XML_GetBuffer(struct ExpatIFace * Self, XML_Parser parser, int len)
{
	return XML_GetBuffer(parser, len);
}

void _Expat_XML_SetStartElementHandler(struct ExpatIFace * Self, XML_Parser parser, XML_StartElementHandler start)
{
	XML_SetStartElementHandler(parser, start);
}

void _Expat_XML_SetEndElementHandler(struct ExpatIFace * Self, XML_Parser parser, XML_EndElementHandler end)
{
	XML_SetEndElementHandler(parser, end);
}

void _Expat_XML_SetElementHandler(struct ExpatIFace * Self, XML_Parser parser, XML_StartElementHandler start, XML_EndElementHandler end)
{
	XML_SetElementHandler(parser, start, end);
}

void _Expat_XML_SetCharacterDataHandler(struct ExpatIFace * Self, XML_Parser parser, XML_CharacterDataHandler handler)
{
	XML_SetCharacterDataHandler(parser, handler);
}

void _Expat_XML_SetProcessingInstructionHandler(struct ExpatIFace * Self, XML_Parser parser, XML_ProcessingInstructionHandler handler)
{
	XML_SetProcessingInstructionHandler(parser, handler);
}

void _Expat_XML_SetCommentHandler(struct ExpatIFace * Self, XML_Parser parser, XML_CommentHandler handler)
{
	XML_SetCommentHandler(parser, handler);
}

void _Expat_XML_SetStartCdataSectionHandler(struct ExpatIFace * Self, XML_Parser parser, XML_StartCdataSectionHandler start)
{
	XML_SetStartCdataSectionHandler(parser, start);
}

void _Expat_XML_SetEndCdataSectionHandler(struct ExpatIFace * Self, XML_Parser parser, XML_EndCdataSectionHandler end)
{
	XML_SetEndCdataSectionHandler(parser, end);
}

void _Expat_XML_SetCdataSectionHandler(struct ExpatIFace * Self, XML_Parser parser, XML_StartCdataSectionHandler start, XML_EndCdataSectionHandler end)
{
	XML_SetCdataSectionHandler(parser, start, end);
}

void _Expat_XML_SetDefaultHandler(struct ExpatIFace * Self, XML_Parser parser, XML_DefaultHandler handler)
{
	XML_SetDefaultHandler(parser, handler);
}

void _Expat_XML_SetDefaultHandlerExpand(struct ExpatIFace * Self, XML_Parser parser, XML_DefaultHandler handler)
{
	XML_SetDefaultHandlerExpand(parser, handler);
}

void _Expat_XML_SetExternalEntityRefHandler(struct ExpatIFace * Self, XML_Parser parser, XML_ExternalEntityRefHandler handler)
{
	XML_SetExternalEntityRefHandler(parser, handler);
}

void _Expat_XML_SetExternalEntityRefHandlerArg(struct ExpatIFace * Self, XML_Parser parser, void * arg)
{
	XML_SetExternalEntityRefHandlerArg(parser, arg);
}

void _Expat_XML_SetUnknownEncodingHandler(struct ExpatIFace * Self, XML_Parser parser, XML_UnknownEncodingHandler handler, void * data)
{
	XML_SetUnknownEncodingHandler(parser, handler, data);
}

void _Expat_XML_SetStartNamespaceDeclHandler(struct ExpatIFace * Self, XML_Parser parser, XML_StartNamespaceDeclHandler start)
{
	XML_SetStartNamespaceDeclHandler(parser, start);
}

void _Expat_XML_SetEndNamespaceDeclHandler(struct ExpatIFace * Self, XML_Parser parser, XML_EndNamespaceDeclHandler end)
{
	XML_SetEndNamespaceDeclHandler(parser, end);
}

void _Expat_XML_SetNamespaceDeclHandler(struct ExpatIFace * Self, XML_Parser parser, XML_StartNamespaceDeclHandler start, XML_EndNamespaceDeclHandler end)
{
	XML_SetNamespaceDeclHandler(parser, start, end);
}

void _Expat_XML_SetXmlDeclHandler(struct ExpatIFace * Self, XML_Parser parser, XML_XmlDeclHandler handler)
{
	XML_SetXmlDeclHandler(parser, handler);
}

void _Expat_XML_SetStartDoctypeDeclHandler(struct ExpatIFace * Self, XML_Parser parser, XML_StartDoctypeDeclHandler start)
{
	XML_SetStartDoctypeDeclHandler(parser, start);
}

void _Expat_XML_SetEndDoctypeDeclHandler(struct ExpatIFace * Self, XML_Parser parser, XML_EndDoctypeDeclHandler end)
{
	XML_SetEndDoctypeDeclHandler(parser, end);
}

void _Expat_XML_SetDoctypeDeclHandler(struct ExpatIFace * Self, XML_Parser parser, XML_StartDoctypeDeclHandler start, XML_EndDoctypeDeclHandler end)
{
	XML_SetDoctypeDeclHandler(parser, start, end);
}

void _Expat_XML_SetElementDeclHandler(struct ExpatIFace * Self, XML_Parser parser, XML_ElementDeclHandler eldecl)
{
	XML_SetElementDeclHandler(parser, eldecl);
}

void _Expat_XML_SetAttlistDeclHandler(struct ExpatIFace * Self, XML_Parser parser, XML_AttlistDeclHandler attdecl)
{
	XML_SetAttlistDeclHandler(parser, attdecl);
}

void _Expat_XML_SetEntityDeclHandler(struct ExpatIFace * Self, XML_Parser parser, XML_EntityDeclHandler handler)
{
	XML_SetEntityDeclHandler(parser, handler);
}

void _Expat_XML_SetUnparsedEntityDeclHandler(struct ExpatIFace * Self, XML_Parser parser, XML_UnparsedEntityDeclHandler handler)
{
	XML_SetUnparsedEntityDeclHandler(parser, handler);
}

void _Expat_XML_SetNotationDeclHandler(struct ExpatIFace * Self, XML_Parser parser, XML_NotationDeclHandler handler)
{
	XML_SetNotationDeclHandler(parser, handler);
}

void _Expat_XML_SetNotStandaloneHandler(struct ExpatIFace * Self, XML_Parser parser, XML_NotStandaloneHandler handler)
{
	XML_SetNotStandaloneHandler(parser, handler);
}

enum XML_Error _Expat_XML_GetErrorCode(struct ExpatIFace * Self, XML_Parser parser)
{
	return XML_GetErrorCode(parser);
}

const XML_LChar * _Expat_XML_ErrorString(struct ExpatIFace * Self, enum XML_Error code)
{
	return XML_ErrorString(code);
}

long _Expat_XML_GetCurrentByteIndex(struct ExpatIFace * Self, XML_Parser parser)
{
	return XML_GetCurrentByteIndex(parser);
}

int _Expat_XML_GetCurrentLineNumber(struct ExpatIFace * Self, XML_Parser parser)
{
	return XML_GetCurrentLineNumber(parser);
}

int _Expat_XML_GetCurrentColumnNumber(struct ExpatIFace * Self, XML_Parser parser)
{
	return XML_GetCurrentColumnNumber(parser);
}

int _Expat_XML_GetCurrentByteCount(struct ExpatIFace * Self, XML_Parser parser)
{
	return XML_GetCurrentByteCount(parser);
}

const char * _Expat_XML_GetInputContext(struct ExpatIFace * Self, XML_Parser parser, int * offset, int * size)
{
	return XML_GetInputContext(parser, offset, size);
}

void _Expat_XML_SetUserData(struct ExpatIFace * Self, XML_Parser parser, void * userData)
{
	XML_SetUserData(parser, userData);
}

void _Expat_XML_DefaultCurrent(struct ExpatIFace * Self, XML_Parser parser)
{
	XML_DefaultCurrent(parser);
}

void _Expat_XML_UseParserAsHandlerArg(struct ExpatIFace * Self, XML_Parser parser)
{
	XML_UseParserAsHandlerArg(parser);
}

enum XML_Status _Expat_XML_SetBase(struct ExpatIFace * Self, XML_Parser parser, const XML_Char *p)
{
	return XML_SetBase(parser, p);
}

const XML_Char * _Expat_XML_GetBase(struct ExpatIFace * Self, XML_Parser parser)
{
	return XML_GetBase(parser);
}

int _Expat_XML_GetSpecifiedAttributeCount(struct ExpatIFace * Self, XML_Parser parser)
{
	return XML_GetSpecifiedAttributeCount(parser);
}

int _Expat_XML_GetIdAttributeIndex(struct ExpatIFace * Self, XML_Parser parser)
{
	return XML_GetIdAttributeIndex(parser);
}

enum XML_Status _Expat_XML_SetEncoding(struct ExpatIFace * Self, XML_Parser parser, const XML_Char *encoding)
{
	return XML_SetEncoding(parser, encoding);
}

int _Expat_XML_SetParamEntityParsing(struct ExpatIFace * Self, XML_Parser parser, enum XML_ParamEntityParsing parsing)
{
	return XML_SetParamEntityParsing(parser, parsing);
}

void _Expat_XML_SetReturnNSTriplet(struct ExpatIFace * Self, XML_Parser parser, int do_nst)
{
	XML_SetReturnNSTriplet(parser, do_nst);
}

const XML_LChar * _Expat_XML_ExpatVersion(struct ExpatIFace * Self)
{
	return XML_ExpatVersion();
}

XML_Expat_Version _Expat_XML_ExpatVersionInfo(struct ExpatIFace * Self)
{
	return XML_ExpatVersionInfo();
}

XML_Bool _Expat_XML_ParserReset(struct ExpatIFace * Self, XML_Parser parser, const XML_Char *encoding)
{
	return XML_ParserReset(parser, encoding);
}

void _Expat_XML_SetSkippedEntityHandler(struct ExpatIFace * Self, XML_Parser parser, XML_SkippedEntityHandler handler)
{
	XML_SetSkippedEntityHandler(parser, handler);
}

enum XML_Error _Expat_XML_UseForeignDTD(struct ExpatIFace * Self, XML_Parser parser, XML_Bool useDTD)
{
	return XML_UseForeignDTD(parser, useDTD);
}

const XML_Feature * _Expat_XML_GetFeatureList(struct ExpatIFace * Self)
{
	return XML_GetFeatureList();
}

enum XML_Status _Expat_XML_StopParser(struct ExpatIFace * Self, XML_Parser parser, XML_Bool resumable)
{
	return XML_StopParser(parser, resumable);
}

enum XML_Status _Expat_XML_ResumeParser(struct ExpatIFace * Self, XML_Parser parser)
{
	return XML_ResumeParser(parser);
}

void _Expat_XML_GetParsingStatus(struct ExpatIFace * Self, XML_Parser parser, XML_ParsingStatus * status)
{
	XML_GetParsingStatus(parser, status);
}

void _Expat_XML_FreeContentModel(struct ExpatIFace * Self, XML_Parser parser, XML_Content * model)
{
	XML_FreeContentModel(parser, model);
}

void * _Expat_XML_MemMalloc(struct ExpatIFace * Self, XML_Parser parser, size_t size)
{
	return XML_MemMalloc(parser, size);
}

void * _Expat_XML_MemRealloc(struct ExpatIFace * Self, XML_Parser parser, void * ptr, size_t size)
{
	XML_MemRealloc(parser, ptr, size);
}

void _Expat_XML_MemFree(struct ExpatIFace * Self, XML_Parser parser, void * ptr)
{
	XML_MemFree(parser, ptr);
}

--- NEW FILE: expat.xml ---
<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE library SYSTEM "library.dtd">
<!-- autogenerated by fdtrans v51.16 -->
<library name="expat" basename="ExpatBase" basetype="Library" openname="expat.library">
	<include>libraries/expat.h</include>
	<interface name="main" version="1.0" struct="ExpatIFace" prefix="_Expat_" asmprefix="IExpat" global="IExpat">
		<method name="Obtain" result="uint32"/>
		<method name="Release" result="uint32"/>
		<method name="Expunge" result="void" status="unimplemented"/>
		<method name="Clone" result="struct Interface *" status="unimplemented"/>
		<method name="XML_ParserCreate" result="XML_Parser">
			<arg name="encodingName" type="const XML_Char *"/>
		</method>
		<method name="XML_ParserCreateNS" result="XML_Parser">
			<arg name="encodingName" type="const XML_Char *"/>
			<arg name="nsSep" type="XML_Char"/>
		</method>
		<method name="XML_ParserCreate_MM" result="XML_Parser">
			<arg name="encoding" type="const XML_Char *"/>
			<arg name="memsuite" type="const XML_Memory_Handling_Suite *"/>
			<arg name="namespaceSeparator" type="const XML_Char *"/>
		</method>
		<method name="XML_ExternalEntityParserCreate" result="XML_Parser">
			<arg name="parser" type="XML_Parser"/>
			<arg name="context" type="const XML_Char *"/>
			<arg name="encoding" type="const XML_Char *"/>
		</method>
		<method name="XML_ParserFree" result="void">
			<arg name="parser" type="XML_Parser"/>
		</method>
		<method name="XML_Parse" result="enum XML_Status">
			<arg name="parser" type="XML_Parser"/>
			<arg name="s" type="const char *"/>
			<arg name="len" type="int"/>
			<arg name="isFinal" type="int"/>
		</method>
		<method name="XML_ParseBuffer" result="enum XML_Status">
			<arg name="parser" type="XML_Parser"/>
			<arg name="len" type="int"/>
			<arg name="isFinal" type="int"/>
		</method>
		<method name="XML_GetBuffer" result="void *">
			<arg name="parser" type="XML_Parser"/>
			<arg name="len" type="int"/>
		</method>
		<method name="XML_SetStartElementHandler" result="void">
			<arg name="parser" type="XML_Parser"/>
			<arg name="start" type="XML_StartElementHandler"/>
		</method>
		<method name="XML_SetEndElementHandler" result="void">
			<arg name="parser" type="XML_Parser"/>
			<arg name="end" type="XML_EndElementHandler"/>
		</method>
		<method name="XML_SetElementHandler" result="void">
			<arg name="parser" type="XML_Parser"/>
			<arg name="start" type="XML_StartElementHandler"/>
			<arg name="end" type="XML_EndElementHandler"/>
		</method>
		<method name="XML_SetCharacterDataHandler" result="void">
			<arg name="parser" type="XML_Parser"/>
			<arg name="handler" type="XML_CharacterDataHandler"/>
		</method>
		<method name="XML_SetProcessingInstructionHandler" result="void">
			<arg name="parser" type="XML_Parser"/>
			<arg name="handler" type="XML_ProcessingInstructionHandler"/>
		</method>
		<method name="XML_SetCommentHandler" result="void">
			<arg name="parser" type="XML_Parser"/>
			<arg name="handler" type="XML_CommentHandler"/>
		</method>
		<method name="XML_SetStartCdataSectionHandler" result="void">
			<arg name="parser" type="XML_Parser"/>
			<arg name="start" type="XML_StartCdataSectionHandler"/>
		</method>
		<method name="XML_SetEndCdataSectionHandler" result="void">
			<arg name="parser" type="XML_Parser"/>
			<arg name="end" type="XML_EndCdataSectionHandler"/>
		</method>
		<method name="XML_SetCdataSectionHandler" result="void">
			<arg name="parser" type="XML_Parser"/>
			<arg name="start" type="XML_StartCdataSectionHandler"/>
			<arg name="end" type="XML_EndCdataSectionHandler"/>
		</method>
		<method name="XML_SetDefaultHandler" result="void">
			<arg name="parser" type="XML_Parser"/>
			<arg name="handler" type="XML_DefaultHandler"/>
		</method>
		<method name="XML_SetDefaultHandlerExpand" result="void">
			<arg name="parser" type="XML_Parser"/>
			<arg name="handler" type="XML_DefaultHandler"/>
		</method>
		<method name="XML_SetExternalEntityRefHandler" result="void">
			<arg name="parser" type="XML_Parser"/>
			<arg name="handler" type="XML_ExternalEntityRefHandler"/>
		</method>
		<method name="XML_SetExternalEntityRefHandlerArg" result="void">
			<arg name="parser" type="XML_Parser"/>
			<arg name="arg" type="void *"/>
		</method>
		<method name="XML_SetUnknownEncodingHandler" result="void">
			<arg name="parser" type="XML_Parser"/>
			<arg name="handler" type="XML_UnknownEncodingHandler"/>
			<arg name="data" type="void *"/>
		</method>
		<method name="XML_SetStartNamespaceDeclHandler" result="void">
			<arg name="parser" type="XML_Parser"/>
			<arg name="start" type="XML_StartNamespaceDeclHandler"/>
		</method>
		<method name="XML_SetEndNamespaceDeclHandler" result="void">
			<arg name="parser" type="XML_Parser"/>
			<arg name="end" type="XML_EndNamespaceDeclHandler"/>
		</method>
		<method name="XML_SetNamespaceDeclHandler" result="void">
			<arg name="parser" type="XML_Parser"/>
			<arg name="start" type="XML_StartNamespaceDeclHandler"/>
			<arg name="end" type="XML_EndNamespaceDeclHandler"/>
		</method>
		<method name="XML_SetXmlDeclHandler" result="void">
			<arg name="parser" type="XML_Parser"/>
			<arg name="handler" type="XML_XmlDeclHandler"/>
		</method>
		<method name="XML_SetStartDoctypeDeclHandler" result="void">
			<arg name="parser" type="XML_Parser"/>
			<arg name="start" type="XML_StartDoctypeDeclHandler"/>
		</method>
		<method name="XML_SetEndDoctypeDeclHandler" result="void">
			<arg name="parser" type="XML_Parser"/>
			<arg name="end" type="XML_EndDoctypeDeclHandler"/>
		</method>
		<method name="XML_SetDoctypeDeclHandler" result="void">
			<arg name="parser" type="XML_Parser"/>
			<arg name="start" type="XML_StartDoctypeDeclHandler"/>
			<arg name="end" type="XML_EndDoctypeDeclHandler"/>
		</method>
		<method name="XML_SetElementDeclHandler" result="void">
			<arg name="parser" type="XML_Parser"/>
			<arg name="eldecl" type="XML_ElementDeclHandler"/>
		</method>
		<method name="XML_SetAttlistDeclHandler" result="void">
			<arg name="parser" type="XML_Parser"/>
			<arg name="attdecl" type="XML_AttlistDeclHandler"/>
		</method>
		<method name="XML_SetEntityDeclHandler" result="void">
			<arg name="parser" type="XML_Parser"/>
			<arg name="handler" type="XML_EntityDeclHandler"/>
		</method>
		<method name="XML_SetUnparsedEntityDeclHandler" result="void">
			<arg name="parser" type="XML_Parser"/>
			<arg name="handler" type="XML_UnparsedEntityDeclHandler"/>
		</method>
		<method name="XML_SetNotationDeclHandler" result="void">
			<arg name="parser" type="XML_Parser"/>
			<arg name="handler" type="XML_NotationDeclHandler"/>
		</method>
		<method name="XML_SetNotStandaloneHandler" result="void">
			<arg name="parser" type="XML_Parser"/>
			<arg name="handler" type="XML_NotStandaloneHandler"/>
		</method>
		<method name="XML_GetErrorCode" result="enum XML_Error">
			<arg name="parser" type="XML_Parser"/>
		</method>
		<method name="XML_ErrorString" result="const XML_LChar *">
			<arg name="code" type="enum XML_Error"/>
		</method>
		<method name="XML_GetCurrentByteIndex" result="long">
			<arg name="parser" type="XML_Parser"/>
		</method>
		<method name="XML_GetCurrentLineNumber" result="int">
			<arg name="parser" type="XML_Parser"/>
		</method>
		<method name="XML_GetCurrentColumnNumber" result="int">
			<arg name="parser" type="XML_Parser"/>
		</method>
		<method name="XML_GetCurrentByteCount" result="int">
			<arg name="parser" type="XML_Parser"/>
		</method>
		<method name="XML_GetInputContext" result="const char *">
			<arg name="parser" type="XML_Parser"/>
			<arg name="offset" type="int *"/>
			<arg name="size" type="int *"/>
		</method>
		<method name="XML_SetUserData" result="void">
			<arg name="parser" type="XML_Parser"/>
			<arg name="userData" type="void *"/>
		</method>
		<method name="XML_DefaultCurrent" result="void">
			<arg name="parser" type="XML_Parser"/>
		</method>
		<method name="XML_UseParserAsHandlerArg" result="void">
			<arg name="parser" type="XML_Parser"/>
		</method>
		<method name="XML_SetBase" result="enum XML_Status">
			<arg name="parser" type="XML_Parser"/>
			<arg name="base" type="const XML_Char *"/>
		</method>
		<method name="XML_GetBase" result="const XML_Char *">
			<arg name="parser" type="XML_Parser"/>
		</method>
		<method name="XML_GetSpecifiedAttributeCount" result="int">
			<arg name="parser" type="XML_Parser"/>
		</method>
		<method name="XML_GetIdAttributeIndex" result="int">
			<arg name="parser" type="XML_Parser"/>
		</method>
		<method name="XML_SetEncoding" result="enum XML_Status">
			<arg name="parser" type="XML_Parser"/>
			<arg name="encoding" type="const XML_Char *"/>
		</method>
		<method name="XML_SetParamEntityParsing" result="int">
			<arg name="parser" type="XML_Parser"/>
			<arg name="parsing" type="enum XML_ParamEntityParsing"/>
		</method>
		<method name="XML_SetReturnNSTriplet" result="void">
			<arg name="parser" type="XML_Parser"/>
			<arg name="do_nst" type="int"/>
		</method>
		<method name="XML_ExpatVersion" result="const XML_LChar *">
		</method>
		<method name="XML_ExpatVersionInfo" result="XML_Expat_Version">
		</method>
		<method name="XML_ParserReset" result="XML_Bool">
			<arg name="parser" type="XML_Parser"/>
			<arg name="encoding" type="const XML_Char *"/>
		</method>
		<method name="XML_SetSkippedEntityHandler" result="void">
			<arg name="parser" type="XML_Parser"/>
			<arg name="handler" type="XML_SkippedEntityHandler"/>
		</method>
		<method name="XML_UseForeignDTD" result="enum XML_Error">
			<arg name="parser" type="XML_Parser"/>
			<arg name="useDTD" type="XML_Bool"/>
		</method>
		<method name="XML_GetFeatureList" result="const XML_Feature *">
		</method>
		<method name="XML_StopParser" result="enum XML_Status">
			<arg name="parser" type="XML_Parser"/>
			<arg name="resumable" type="XML_Bool"/>
		</method>
		<method name="XML_ResumeParser" result="enum XML_Status">
			<arg name="parser" type="XML_Parser"/>
		</method>
		<method name="XML_GetParsingStatus" result="void">
			<arg name="parser" type="XML_Parser"/>
			<arg name="status" type="XML_ParsingStatus *"/>
		</method>
		<method name="XML_FreeContentModel" result="void">
			<arg name="parser" type="XML_Parser"/>
			<arg name="model" type="XML_Content *"/>
		</method>
		<method name="XML_MemMalloc" result="void *">
			<arg name="parser" type="XML_Parser"/>
			<arg name="size" type="size_t"/>
		</method>
		<method name="XML_MemRealloc" result="void *">
			<arg name="parser" type="XML_Parser"/>
			<arg name="ptr" type="void *"/>
			<arg name="size" type="size_t"/>
		</method>
		<method name="XML_MemFree" result="void">
			<arg name="parser" type="XML_Parser"/>
			<arg name="ptr" type="void *"/>
		</method>
	</interface>
</library>

--- NEW FILE: expat_lib.c ---
/*
** Copyright (c) 2001-2005 Expat maintainers.
**
** Permission is hereby granted, free of charge, to any person obtaining
** a copy of this software and associated documentation files (the
** "Software"), to deal in the Software without restriction, including
** without limitation the rights to use, copy, modify, merge, publish,
** distribute, sublicense, and/or sell copies of the Software, and to
** permit persons to whom the Software is furnished to do so, subject to
** the following conditions:
** 
** The above copyright notice and this permission notice shall be included
** in all copies or substantial portions of the Software.
** 
** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
** SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

#include <dos/dos.h>
#include <proto/exec.h>

#define LIBNAME		"expat.library"
#define LIBPRI		0
#define VERSION		3
#define REVISION	1
#define VSTRING		"expat.library 3.1 (6.11.2005)"  /* dd.mm.yyyy */


static const char* __attribute__((used)) verstag = "\0$VER: " VSTRING;


struct ExpatBase {
	struct Library libNode;
	uint16 pad;
	BPTR SegList;
};


struct ExpatBase * libInit(struct ExpatBase *libBase, BPTR seglist, struct ExecIFace *ISys);
uint32 libObtain (struct LibraryManagerInterface *Self);
uint32 libRelease (struct LibraryManagerInterface *Self);
struct ExpatBase *libOpen (struct LibraryManagerInterface *Self, uint32 version);
BPTR libClose (struct LibraryManagerInterface *Self);
BPTR libExpunge (struct LibraryManagerInterface *Self);


static APTR lib_manager_vectors[] = {
	libObtain,
	libRelease,
	NULL,
	NULL,
	libOpen,
	libClose,
	libExpunge,
	NULL,
	(APTR)-1,
};


static struct TagItem lib_managerTags[] = {
	{ MIT_Name, (uint32)"__library" },
	{ MIT_VectorTable, (uint32)lib_manager_vectors },
	{ MIT_Version, 1 },
	{ TAG_END, 0 }
};


extern void *main_vectors[];

static struct TagItem lib_mainTags[] = {
	{ MIT_Name, (uint32)"main" },
	{ MIT_VectorTable, (uint32)main_vectors },
	{ MIT_Version, 1 },
	{ TAG_END, 0 }
};


static APTR libInterfaces[] = {
	lib_managerTags,
	lib_mainTags,
	NULL
};


static struct TagItem libCreateTags[] = {
	{ CLT_DataSize, sizeof(struct ExpatBase) },
	{ CLT_InitFunc, (uint32)libInit },
	{ CLT_Interfaces, (uint32)libInterfaces },
	{ TAG_END, 0 }
};


static struct Resident __attribute__((used)) lib_res = {
	RTC_MATCHWORD,	// rt_MatchWord
	&lib_res,		// rt_MatchTag
	&lib_res+1,		// rt_EndSkip
	RTF_NATIVE | RTF_AUTOINIT,	// rt_Flags
	VERSION,		// rt_Version
	NT_LIBRARY,		// rt_Type
	LIBPRI,			// rt_Pri
	LIBNAME,		// rt_Name
	VSTRING,		// rt_IdString
	libCreateTags	// rt_Init
};


struct Library *DOSLib = 0;
struct Library *UtilityBase = 0;

struct ExecIFace *IExec = 0;
struct DOSIFace *IDOS = 0;
struct UtilityIFace *IUtility = 0;


void _start()
{
}


struct ExpatBase *libInit(struct ExpatBase *libBase, BPTR seglist, struct ExecIFace *ISys)
{
	libBase->libNode.lib_Node.ln_Type = NT_LIBRARY;
	libBase->libNode.lib_Node.ln_Pri = LIBPRI;
	libBase->libNode.lib_Node.ln_Name = LIBNAME;
	libBase->libNode.lib_Flags = LIBF_SUMUSED|LIBF_CHANGED;
	libBase->libNode.lib_Version = VERSION;
	libBase->libNode.lib_Revision = REVISION;
	libBase->libNode.lib_IdString = VSTRING;
	libBase->SegList = seglist;

	IExec = ISys;

	DOSLib = OpenLibrary("dos.library", 51);
	if ( DOSLib != 0 )  {
		IDOS = (struct DOSIFace *)GetInterface(DOSLib, "main", 1, NULL);
		if ( IDOS != 0 )  {
			UtilityBase = OpenLibrary("utility.library", 51);
			if ( UtilityBase != 0 )  {
				IUtility = (struct UtilityIFace*)GetInterface(UtilityBase, "main", 1, NULL);
				if ( IUtility != 0 )  {
					return libBase;
				}

				CloseLibrary(UtilityBase);
			}

			DropInterface((struct Interface *)IDOS);
		}

		CloseLibrary(DOSLib);
	}

	return NULL;
}


uint32 libObtain( struct LibraryManagerInterface *Self )
{
	++Self->Data.RefCount;
	return Self->Data.RefCount;
}


uint32 libRelease( struct LibraryManagerInterface *Self )
{
	--Self->Data.RefCount;
	return Self->Data.RefCount;
}


struct ExpatBase *libOpen( struct LibraryManagerInterface *Self, uint32 version )
{
	struct ExpatBase *libBase;

	libBase = (struct ExpatBase *)Self->Data.LibBase;

	++libBase->libNode.lib_OpenCnt;
	libBase->libNode.lib_Flags &= ~LIBF_DELEXP;

	return libBase;
}


BPTR libClose( struct LibraryManagerInterface *Self )
{
	struct ExpatBase *libBase;

	libBase = (struct ExpatBase *)Self->Data.LibBase;

	--libBase->libNode.lib_OpenCnt;
	if ( libBase->libNode.lib_OpenCnt ) {
		return 0;
	}

	if ( libBase->libNode.lib_Flags & LIBF_DELEXP ) {
		return (BPTR)Self->LibExpunge();
	}
	else {
		return 0;
	}
}


BPTR libExpunge( struct LibraryManagerInterface *Self )
{
	struct ExpatBase *libBase;
	BPTR result = 0;

	libBase = (struct ExpatBase *)Self->Data.LibBase;

	if (libBase->libNode.lib_OpenCnt == 0) {
		Remove(&libBase->libNode.lib_Node);

		result = libBase->SegList;

		DropInterface((struct Interface *)IUtility);
		CloseLibrary(UtilityBase);
		DropInterface((struct Interface *)IDOS);
		CloseLibrary(DOSLib);

		DeleteLibrary(&libBase->libNode);
	}
	else {
		libBase->libNode.lib_Flags |= LIBF_DELEXP;
	}

	return result;
}

--- NEW FILE: launch.c ---
/*
** Copyright (c) 2001-2005 Expat maintainers.
**
** Permission is hereby granted, free of charge, to any person obtaining
** a copy of this software and associated documentation files (the
** "Software"), to deal in the Software without restriction, including
** without limitation the rights to use, copy, modify, merge, publish,
** distribute, sublicense, and/or sell copies of the Software, and to
** permit persons to whom the Software is furnished to do so, subject to
** the following conditions:
** 
** The above copyright notice and this permission notice shall be included
** in all copies or substantial portions of the Software.
** 
** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
** SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

#include <stdlib.h>
#include <proto/exec.h>

struct Library* ExpatBase = 0;
struct ExpatIFace* IExpat = 0;


int amiga_main(int argc, char** argv);
void cleanup();


int main(int argc, char** argv)
{
	int result = -1;

	atexit(cleanup);

	ExpatBase = OpenLibrary("expat.library", 2);
	if ( ExpatBase != 0 )  {
		IExpat = (struct ExpatIFace*)GetInterface(ExpatBase, "main", 1, NULL);
		if ( IExpat != 0 )  {
			result = amiga_main(argc, argv);
		}
	}

	cleanup();

	return result;
}


void cleanup()
{
	if ( IExpat != 0 )  {
		DropInterface((struct Interface*)IExpat);
		IExpat = 0;
	}

	if ( ExpatBase != 0 )  {
		CloseLibrary(ExpatBase);
		ExpatBase = 0;
	}
}


From ssolie at users.sourceforge.net  Sat Dec 24 07:40:12 2005
From: ssolie at users.sourceforge.net (Steven Solie)
Date: Sat, 24 Dec 2005 07:40:12 +0100 (CET)
Subject: [Expat-checkins] expat/amiga/libs - New directory
Message-ID: <20051224064012.BDA561E4002@bag.python.org>

Update of /cvsroot/expat/expat/amiga/libs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2613/libs

Log Message:
Directory /cvsroot/expat/expat/amiga/libs added to the repository



From ssolie at users.sourceforge.net  Sat Dec 24 07:40:13 2005
From: ssolie at users.sourceforge.net (Steven Solie)
Date: Sat, 24 Dec 2005 07:40:13 +0100 (CET)
Subject: [Expat-checkins] expat/amiga/lib - New directory
Message-ID: <20051224064013.099B41E4002@bag.python.org>

Update of /cvsroot/expat/expat/amiga/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2613/lib

Log Message:
Directory /cvsroot/expat/expat/amiga/lib added to the repository



From ssolie at users.sourceforge.net  Sat Dec 24 07:42:35 2005
From: ssolie at users.sourceforge.net (Steven Solie)
Date: Sat, 24 Dec 2005 07:42:35 +0100 (CET)
Subject: [Expat-checkins] expat/amiga/include - New directory
Message-ID: <20051224064235.25BDA1E4002@bag.python.org>

Update of /cvsroot/expat/expat/amiga/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2922/include

Log Message:
Directory /cvsroot/expat/expat/amiga/include added to the repository



From ssolie at users.sourceforge.net  Sat Dec 24 07:44:17 2005
From: ssolie at users.sourceforge.net (Steven Solie)
Date: Sat, 24 Dec 2005 07:44:17 +0100 (CET)
Subject: [Expat-checkins] expat/amiga/include/inline4 - New directory
Message-ID: <20051224064417.E67801E401B@bag.python.org>

Update of /cvsroot/expat/expat/amiga/include/inline4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3162/inline4

Log Message:
Directory /cvsroot/expat/expat/amiga/include/inline4 added to the repository



From ssolie at users.sourceforge.net  Sat Dec 24 07:44:29 2005
From: ssolie at users.sourceforge.net (Steven Solie)
Date: Sat, 24 Dec 2005 07:44:29 +0100 (CET)
Subject: [Expat-checkins] expat/amiga/include/interfaces - New directory
Message-ID: <20051224064429.B3CBA1E4014@bag.python.org>

Update of /cvsroot/expat/expat/amiga/include/interfaces
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3192/interfaces

Log Message:
Directory /cvsroot/expat/expat/amiga/include/interfaces added to the repository



From ssolie at users.sourceforge.net  Sat Dec 24 07:44:29 2005
From: ssolie at users.sourceforge.net (Steven Solie)
Date: Sat, 24 Dec 2005 07:44:29 +0100 (CET)
Subject: [Expat-checkins] expat/amiga/include/proto - New directory
Message-ID: <20051224064429.EEEB11E4012@bag.python.org>

Update of /cvsroot/expat/expat/amiga/include/proto
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3192/proto

Log Message:
Directory /cvsroot/expat/expat/amiga/include/proto added to the repository



From ssolie at users.sourceforge.net  Sat Dec 24 07:44:29 2005
From: ssolie at users.sourceforge.net (Steven Solie)
Date: Sat, 24 Dec 2005 07:44:29 +0100 (CET)
Subject: [Expat-checkins] expat/amiga/include/libraries - New directory
Message-ID: <20051224064429.F422E1E4014@bag.python.org>

Update of /cvsroot/expat/expat/amiga/include/libraries
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3192/libraries

Log Message:
Directory /cvsroot/expat/expat/amiga/include/libraries added to the repository



From ssolie at users.sourceforge.net  Sat Dec 24 07:45:39 2005
From: ssolie at users.sourceforge.net (Steven Solie)
Date: Sat, 24 Dec 2005 07:45:39 +0100 (CET)
Subject: [Expat-checkins] expat/amiga/include/inline4 expat.h,NONE,1.1
Message-ID: <20051224064539.8E3AF1E4007@bag.python.org>

Update of /cvsroot/expat/expat/amiga/include/inline4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3309/include/inline4

Added Files:
	expat.h 
Log Message:


--- NEW FILE: expat.h ---
#ifndef INLINE4_EXPAT_H
#define INLINE4_EXPAT_H

/*
** This file was auto generated by idltool 51.6.
**
** It provides compatibility to OS3 style library
** calls by substituting functions.
**
** Do not edit manually.
*/ 

#ifndef EXEC_TYPES_H
#include <exec/types.h>
#endif
#ifndef EXEC_EXEC_H
#include <exec/exec.h>
#endif
#ifndef EXEC_INTERFACES_H
#include <exec/interfaces.h>
#endif

#ifndef LIBRARIES_EXPAT_H
#include <libraries/expat.h>
#endif

/* Inline macros for Interface "main" */
#define XML_ParserCreate(encodingName) IExpat->XML_ParserCreate(encodingName) 
#define XML_ParserCreateNS(encodingName, nsSep) IExpat->XML_ParserCreateNS(encodingName, nsSep) 
#define XML_ParserCreate_MM(encoding, memsuite, namespaceSeparator) IExpat->XML_ParserCreate_MM(encoding, memsuite, namespaceSeparator) 
#define XML_ExternalEntityParserCreate(parser, context, encoding) IExpat->XML_ExternalEntityParserCreate(parser, context, encoding) 
#define XML_ParserFree(parser) IExpat->XML_ParserFree(parser) 
#define XML_Parse(parser, s, len, isFinal) IExpat->XML_Parse(parser, s, len, isFinal) 
#define XML_ParseBuffer(parser, len, isFinal) IExpat->XML_ParseBuffer(parser, len, isFinal) 
#define XML_GetBuffer(parser, len) IExpat->XML_GetBuffer(parser, len) 
#define XML_SetStartElementHandler(parser, start) IExpat->XML_SetStartElementHandler(parser, start) 
#define XML_SetEndElementHandler(parser, end) IExpat->XML_SetEndElementHandler(parser, end) 
#define XML_SetElementHandler(parser, start, end) IExpat->XML_SetElementHandler(parser, start, end) 
#define XML_SetCharacterDataHandler(parser, handler) IExpat->XML_SetCharacterDataHandler(parser, handler) 
#define XML_SetProcessingInstructionHandler(parser, handler) IExpat->XML_SetProcessingInstructionHandler(parser, handler) 
#define XML_SetCommentHandler(parser, handler) IExpat->XML_SetCommentHandler(parser, handler) 
#define XML_SetStartCdataSectionHandler(parser, start) IExpat->XML_SetStartCdataSectionHandler(parser, start) 
#define XML_SetEndCdataSectionHandler(parser, end) IExpat->XML_SetEndCdataSectionHandler(parser, end) 
#define XML_SetCdataSectionHandler(parser, start, end) IExpat->XML_SetCdataSectionHandler(parser, start, end) 
#define XML_SetDefaultHandler(parser, handler) IExpat->XML_SetDefaultHandler(parser, handler) 
#define XML_SetDefaultHandlerExpand(parser, handler) IExpat->XML_SetDefaultHandlerExpand(parser, handler) 
#define XML_SetExternalEntityRefHandler(parser, handler) IExpat->XML_SetExternalEntityRefHandler(parser, handler) 
#define XML_SetExternalEntityRefHandlerArg(parser, arg) IExpat->XML_SetExternalEntityRefHandlerArg(parser, arg) 
#define XML_SetUnknownEncodingHandler(parser, handler, data) IExpat->XML_SetUnknownEncodingHandler(parser, handler, data) 
#define XML_SetStartNamespaceDeclHandler(parser, start) IExpat->XML_SetStartNamespaceDeclHandler(parser, start) 
#define XML_SetEndNamespaceDeclHandler(parser, end) IExpat->XML_SetEndNamespaceDeclHandler(parser, end) 
#define XML_SetNamespaceDeclHandler(parser, start, end) IExpat->XML_SetNamespaceDeclHandler(parser, start, end) 
#define XML_SetXmlDeclHandler(parser, handler) IExpat->XML_SetXmlDeclHandler(parser, handler) 
#define XML_SetStartDoctypeDeclHandler(parser, start) IExpat->XML_SetStartDoctypeDeclHandler(parser, start) 
#define XML_SetEndDoctypeDeclHandler(parser, end) IExpat->XML_SetEndDoctypeDeclHandler(parser, end) 
#define XML_SetDoctypeDeclHandler(parser, start, end) IExpat->XML_SetDoctypeDeclHandler(parser, start, end) 
#define XML_SetElementDeclHandler(parser, eldecl) IExpat->XML_SetElementDeclHandler(parser, eldecl) 
#define XML_SetAttlistDeclHandler(parser, attdecl) IExpat->XML_SetAttlistDeclHandler(parser, attdecl) 
#define XML_SetEntityDeclHandler(parser, handler) IExpat->XML_SetEntityDeclHandler(parser, handler) 
#define XML_SetUnparsedEntityDeclHandler(parser, handler) IExpat->XML_SetUnparsedEntityDeclHandler(parser, handler) 
#define XML_SetNotationDeclHandler(parser, handler) IExpat->XML_SetNotationDeclHandler(parser, handler) 
#define XML_SetNotStandaloneHandler(parser, handler) IExpat->XML_SetNotStandaloneHandler(parser, handler) 
#define XML_GetErrorCode(parser) IExpat->XML_GetErrorCode(parser) 
#define XML_ErrorString(code) IExpat->XML_ErrorString(code) 
#define XML_GetCurrentByteIndex(parser) IExpat->XML_GetCurrentByteIndex(parser) 
#define XML_GetCurrentLineNumber(parser) IExpat->XML_GetCurrentLineNumber(parser) 
#define XML_GetCurrentColumnNumber(parser) IExpat->XML_GetCurrentColumnNumber(parser) 
#define XML_GetCurrentByteCount(parser) IExpat->XML_GetCurrentByteCount(parser) 
#define XML_GetInputContext(parser, offset, size) IExpat->XML_GetInputContext(parser, offset, size) 
#define XML_SetUserData(parser, userData) IExpat->XML_SetUserData(parser, userData) 
#define XML_DefaultCurrent(parser) IExpat->XML_DefaultCurrent(parser) 
#define XML_UseParserAsHandlerArg(parser) IExpat->XML_UseParserAsHandlerArg(parser) 
#define XML_SetBase(parser, base) IExpat->XML_SetBase(parser, base) 
#define XML_GetBase(parser) IExpat->XML_GetBase(parser) 
#define XML_GetSpecifiedAttributeCount(parser) IExpat->XML_GetSpecifiedAttributeCount(parser) 
#define XML_GetIdAttributeIndex(parser) IExpat->XML_GetIdAttributeIndex(parser) 
#define XML_SetEncoding(parser, encoding) IExpat->XML_SetEncoding(parser, encoding) 
#define XML_SetParamEntityParsing(parser, parsing) IExpat->XML_SetParamEntityParsing(parser, parsing) 
#define XML_SetReturnNSTriplet(parser, do_nst) IExpat->XML_SetReturnNSTriplet(parser, do_nst) 
#define XML_ExpatVersion() IExpat->XML_ExpatVersion() 
#define XML_ExpatVersionInfo() IExpat->XML_ExpatVersionInfo() 
#define XML_ParserReset(parser, encoding) IExpat->XML_ParserReset(parser, encoding) 
#define XML_SetSkippedEntityHandler(parser, handler) IExpat->XML_SetSkippedEntityHandler(parser, handler) 
#define XML_UseForeignDTD(parser, useDTD) IExpat->XML_UseForeignDTD(parser, useDTD) 
#define XML_GetFeatureList() IExpat->XML_GetFeatureList() 
#define XML_StopParser(parser, resumable) IExpat->XML_StopParser(parser, resumable) 
#define XML_ResumeParser(parser) IExpat->XML_ResumeParser(parser) 
#define XML_GetParsingStatus(parser, status) IExpat->XML_GetParsingStatus(parser, status) 
#define XML_FreeContentModel(parser, model) IExpat->XML_FreeContentModel(parser, model) 
#define XML_MemMalloc(parser, size) IExpat->XML_MemMalloc(parser, size) 
#define XML_MemRealloc(parser, ptr, size) IExpat->XML_MemRealloc(parser, ptr, size) 
#define XML_MemFree(parser, ptr) IExpat->XML_MemFree(parser, ptr) 

#endif /* INLINE4_EXPAT_H */


From ssolie at users.sourceforge.net  Sat Dec 24 07:45:39 2005
From: ssolie at users.sourceforge.net (Steven Solie)
Date: Sat, 24 Dec 2005 07:45:39 +0100 (CET)
Subject: [Expat-checkins] expat/amiga/include/interfaces expat.h,NONE,1.1
Message-ID: <20051224064539.A00171E4009@bag.python.org>

Update of /cvsroot/expat/expat/amiga/include/interfaces
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3309/include/interfaces

Added Files:
	expat.h 
Log Message:


--- NEW FILE: expat.h ---
#ifndef EXPAT_INTERFACE_DEF_H
#define EXPAT_INTERFACE_DEF_H

/*
** This file was machine generated by idltool 51.6.
** Do not edit
*/ 

#ifndef EXEC_TYPES_H
#include <exec/types.h>
#endif
#ifndef EXEC_EXEC_H
#include <exec/exec.h>
#endif
#ifndef EXEC_INTERFACES_H
#include <exec/interfaces.h>
#endif

#ifndef LIBRARIES_EXPAT_H
#include <libraries/expat.h>
#endif

struct ExpatIFace
{
	struct InterfaceData Data;

	uint32 APICALL (*Obtain)(struct ExpatIFace *Self);
	uint32 APICALL (*Release)(struct ExpatIFace *Self);
	void APICALL (*Expunge)(struct ExpatIFace *Self);
	struct Interface * APICALL (*Clone)(struct ExpatIFace *Self);
	XML_Parser APICALL (*XML_ParserCreate)(struct ExpatIFace *Self, const XML_Char * encodingName);
	XML_Parser APICALL (*XML_ParserCreateNS)(struct ExpatIFace *Self, const XML_Char * encodingName, XML_Char nsSep);
	XML_Parser APICALL (*XML_ParserCreate_MM)(struct ExpatIFace *Self, const XML_Char * encoding, const XML_Memory_Handling_Suite * memsuite, const XML_Char * namespaceSeparator);
	XML_Parser APICALL (*XML_ExternalEntityParserCreate)(struct ExpatIFace *Self, XML_Parser parser, const XML_Char * context, const XML_Char * encoding);
	void APICALL (*XML_ParserFree)(struct ExpatIFace *Self, XML_Parser parser);
	enum XML_Status APICALL (*XML_Parse)(struct ExpatIFace *Self, XML_Parser parser, const char * s, int len, int isFinal);
	enum XML_Status APICALL (*XML_ParseBuffer)(struct ExpatIFace *Self, XML_Parser parser, int len, int isFinal);
	void * APICALL (*XML_GetBuffer)(struct ExpatIFace *Self, XML_Parser parser, int len);
	void APICALL (*XML_SetStartElementHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_StartElementHandler start);
	void APICALL (*XML_SetEndElementHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_EndElementHandler end);
	void APICALL (*XML_SetElementHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_StartElementHandler start, XML_EndElementHandler end);
	void APICALL (*XML_SetCharacterDataHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_CharacterDataHandler handler);
	void APICALL (*XML_SetProcessingInstructionHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_ProcessingInstructionHandler handler);
	void APICALL (*XML_SetCommentHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_CommentHandler handler);
	void APICALL (*XML_SetStartCdataSectionHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_StartCdataSectionHandler start);
	void APICALL (*XML_SetEndCdataSectionHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_EndCdataSectionHandler end);
	void APICALL (*XML_SetCdataSectionHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_StartCdataSectionHandler start, XML_EndCdataSectionHandler end);
	void APICALL (*XML_SetDefaultHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_DefaultHandler handler);
	void APICALL (*XML_SetDefaultHandlerExpand)(struct ExpatIFace *Self, XML_Parser parser, XML_DefaultHandler handler);
	void APICALL (*XML_SetExternalEntityRefHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_ExternalEntityRefHandler handler);
	void APICALL (*XML_SetExternalEntityRefHandlerArg)(struct ExpatIFace *Self, XML_Parser parser, void * arg);
	void APICALL (*XML_SetUnknownEncodingHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_UnknownEncodingHandler handler, void * data);
	void APICALL (*XML_SetStartNamespaceDeclHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_StartNamespaceDeclHandler start);
	void APICALL (*XML_SetEndNamespaceDeclHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_EndNamespaceDeclHandler end);
	void APICALL (*XML_SetNamespaceDeclHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_StartNamespaceDeclHandler start, XML_EndNamespaceDeclHandler end);
	void APICALL (*XML_SetXmlDeclHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_XmlDeclHandler handler);
	void APICALL (*XML_SetStartDoctypeDeclHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_StartDoctypeDeclHandler start);
	void APICALL (*XML_SetEndDoctypeDeclHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_EndDoctypeDeclHandler end);
	void APICALL (*XML_SetDoctypeDeclHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_StartDoctypeDeclHandler start, XML_EndDoctypeDeclHandler end);
	void APICALL (*XML_SetElementDeclHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_ElementDeclHandler eldecl);
	void APICALL (*XML_SetAttlistDeclHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_AttlistDeclHandler attdecl);
	void APICALL (*XML_SetEntityDeclHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_EntityDeclHandler handler);
	void APICALL (*XML_SetUnparsedEntityDeclHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_UnparsedEntityDeclHandler handler);
	void APICALL (*XML_SetNotationDeclHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_NotationDeclHandler handler);
	void APICALL (*XML_SetNotStandaloneHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_NotStandaloneHandler handler);
	enum XML_Error APICALL (*XML_GetErrorCode)(struct ExpatIFace *Self, XML_Parser parser);
	const XML_LChar * APICALL (*XML_ErrorString)(struct ExpatIFace *Self, enum XML_Error code);
	long APICALL (*XML_GetCurrentByteIndex)(struct ExpatIFace *Self, XML_Parser parser);
	int APICALL (*XML_GetCurrentLineNumber)(struct ExpatIFace *Self, XML_Parser parser);
	int APICALL (*XML_GetCurrentColumnNumber)(struct ExpatIFace *Self, XML_Parser parser);
	int APICALL (*XML_GetCurrentByteCount)(struct ExpatIFace *Self, XML_Parser parser);
	const char * APICALL (*XML_GetInputContext)(struct ExpatIFace *Self, XML_Parser parser, int * offset, int * size);
	void APICALL (*XML_SetUserData)(struct ExpatIFace *Self, XML_Parser parser, void * userData);
	void APICALL (*XML_DefaultCurrent)(struct ExpatIFace *Self, XML_Parser parser);
	void APICALL (*XML_UseParserAsHandlerArg)(struct ExpatIFace *Self, XML_Parser parser);
	enum XML_Status APICALL (*XML_SetBase)(struct ExpatIFace *Self, XML_Parser parser, const XML_Char * base);
	const XML_Char * APICALL (*XML_GetBase)(struct ExpatIFace *Self, XML_Parser parser);
	int APICALL (*XML_GetSpecifiedAttributeCount)(struct ExpatIFace *Self, XML_Parser parser);
	int APICALL (*XML_GetIdAttributeIndex)(struct ExpatIFace *Self, XML_Parser parser);
	enum XML_Status APICALL (*XML_SetEncoding)(struct ExpatIFace *Self, XML_Parser parser, const XML_Char * encoding);
	int APICALL (*XML_SetParamEntityParsing)(struct ExpatIFace *Self, XML_Parser parser, enum XML_ParamEntityParsing parsing);
	void APICALL (*XML_SetReturnNSTriplet)(struct ExpatIFace *Self, XML_Parser parser, int do_nst);
	const XML_LChar * APICALL (*XML_ExpatVersion)(struct ExpatIFace *Self);
	XML_Expat_Version APICALL (*XML_ExpatVersionInfo)(struct ExpatIFace *Self);
	XML_Bool APICALL (*XML_ParserReset)(struct ExpatIFace *Self, XML_Parser parser, const XML_Char * encoding);
	void APICALL (*XML_SetSkippedEntityHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_SkippedEntityHandler handler);
	enum XML_Error APICALL (*XML_UseForeignDTD)(struct ExpatIFace *Self, XML_Parser parser, XML_Bool useDTD);
	const XML_Feature * APICALL (*XML_GetFeatureList)(struct ExpatIFace *Self);
	enum XML_Status APICALL (*XML_StopParser)(struct ExpatIFace *Self, XML_Parser parser, XML_Bool resumable);
	enum XML_Status APICALL (*XML_ResumeParser)(struct ExpatIFace *Self, XML_Parser parser);
	void APICALL (*XML_GetParsingStatus)(struct ExpatIFace *Self, XML_Parser parser, XML_ParsingStatus * status);
	void APICALL (*XML_FreeContentModel)(struct ExpatIFace *Self, XML_Parser parser, XML_Content * model);
	void * APICALL (*XML_MemMalloc)(struct ExpatIFace *Self, XML_Parser parser, size_t size);
	void * APICALL (*XML_MemRealloc)(struct ExpatIFace *Self, XML_Parser parser, void * ptr, size_t size);
	void APICALL (*XML_MemFree)(struct ExpatIFace *Self, XML_Parser parser, void * ptr);
};

#endif /* EXPAT_INTERFACE_DEF_H */


From ssolie at users.sourceforge.net  Sat Dec 24 07:45:39 2005
From: ssolie at users.sourceforge.net (Steven Solie)
Date: Sat, 24 Dec 2005 07:45:39 +0100 (CET)
Subject: [Expat-checkins] expat/amiga/include/proto expat.h,NONE,1.1
Message-ID: <20051224064539.EF6641E4007@bag.python.org>

Update of /cvsroot/expat/expat/amiga/include/proto
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3309/include/proto

Added Files:
	expat.h 
Log Message:


--- NEW FILE: expat.h ---
#ifndef PROTO_EXPAT_H
#define PROTO_EXPAT_H

/*
**	$Id: expat.h,v 1.1 2005/12/24 06:45:36 ssolie Exp $
**	Includes Release 50.1
**
**	Prototype/inline/pragma header file combo
**
**	(C) Copyright 2003-2005 Amiga, Inc.
**	    All Rights Reserved
*/

#ifndef LIBRARIES_EXPAT_H
#include <libraries/expat.h>
#endif

/****************************************************************************/

#ifndef __NOLIBBASE__
 #ifndef __USE_BASETYPE__
  extern struct Library * ExpatBase;
 #else
  extern struct Library * ExpatBase;
 #endif /* __USE_BASETYPE__ */
#endif /* __NOLIBBASE__ */

/****************************************************************************/

#ifdef __amigaos4__
 #include <interfaces/expat.h>
 #ifdef __USE_INLINE__
  #include <inline4/expat.h>
 #endif /* __USE_INLINE__ */
 #ifndef CLIB_EXPAT_PROTOS_H
  #define CLIB_EXPAT_PROTOS_H 1
 #endif /* CLIB_EXPAT_PROTOS_H */
 #ifndef __NOGLOBALIFACE__
  extern struct ExpatIFace *IExpat;
 #endif /* __NOGLOBALIFACE__ */
#else /* __amigaos4__ */
 #ifndef CLIB_EXPAT_PROTOS_H
  #include <clib/expat_protos.h>
 #endif /* CLIB_EXPAT_PROTOS_H */
 #if defined(__GNUC__)
  #ifndef __PPC__
   #include <inline/expat.h>
  #else
   #include <ppcinline/expat.h>
  #endif /* __PPC__ */
 #elif defined(__VBCC__)
  #ifndef __PPC__
   #include <inline/expat_protos.h>
  #endif /* __PPC__ */
 #else
  #include <pragmas/expat_pragmas.h>
 #endif /* __GNUC__ */
#endif /* __amigaos4__ */

/****************************************************************************/

#endif /* PROTO_EXPAT_H */


From ssolie at users.sourceforge.net  Sat Dec 24 07:45:41 2005
From: ssolie at users.sourceforge.net (Steven Solie)
Date: Sat, 24 Dec 2005 07:45:41 +0100 (CET)
Subject: [Expat-checkins] expat/amiga/include/libraries expat.h,NONE,1.1
Message-ID: <20051224064541.0F29A1E400F@bag.python.org>

Update of /cvsroot/expat/expat/amiga/include/libraries
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3309/include/libraries

Added Files:
	expat.h 
Log Message:


--- NEW FILE: expat.h ---
#ifndef LIBRARIES_EXPAT_H
#define LIBRARIES_EXPAT_H

/*
** Copyright (c) 2001-2005 Expat maintainers.
**
** Permission is hereby granted, free of charge, to any person obtaining
** a copy of this software and associated documentation files (the
** "Software"), to deal in the Software without restriction, including
** without limitation the rights to use, copy, modify, merge, publish,
** distribute, sublicense, and/or sell copies of the Software, and to
** permit persons to whom the Software is furnished to do so, subject to
** the following conditions:
** 
** The above copyright notice and this permission notice shall be included
** in all copies or substantial portions of the Software.
** 
** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
** SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/


/****************************************************************************/

#ifdef __cplusplus
extern "C" {
#endif

#ifdef __GNUC__
   #ifdef __PPC__
    #pragma pack(2)
   #endif
#elif defined(__VBCC__)
   #pragma amiga-align
#endif

/****************************************************************************/


#include <stdlib.h>

#ifndef XMLCALL
#define XMLCALL
#endif

typedef char XML_Char;
typedef char XML_LChar;

struct XML_ParserStruct;
typedef struct XML_ParserStruct *XML_Parser;

typedef unsigned char XML_Bool;
#define XML_TRUE   ((XML_Bool) 1)
#define XML_FALSE  ((XML_Bool) 0)

enum XML_Status {
  XML_STATUS_ERROR = 0,
#define XML_STATUS_ERROR XML_STATUS_ERROR
  XML_STATUS_OK = 1,
#define XML_STATUS_OK XML_STATUS_OK
  XML_STATUS_SUSPENDED = 2,
#define XML_STATUS_SUSPENDED XML_STATUS_SUSPENDED
};

enum XML_Error {
  XML_ERROR_NONE,
  XML_ERROR_NO_MEMORY,
  XML_ERROR_SYNTAX,
  XML_ERROR_NO_ELEMENTS,
  XML_ERROR_INVALID_TOKEN,
  XML_ERROR_UNCLOSED_TOKEN,
  XML_ERROR_PARTIAL_CHAR,
  XML_ERROR_TAG_MISMATCH,
  XML_ERROR_DUPLICATE_ATTRIBUTE,
  XML_ERROR_JUNK_AFTER_DOC_ELEMENT,
  XML_ERROR_PARAM_ENTITY_REF,
  XML_ERROR_UNDEFINED_ENTITY,
  XML_ERROR_RECURSIVE_ENTITY_REF,
  XML_ERROR_ASYNC_ENTITY,
  XML_ERROR_BAD_CHAR_REF,
  XML_ERROR_BINARY_ENTITY_REF,
  XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF,
  XML_ERROR_MISPLACED_XML_PI,
  XML_ERROR_UNKNOWN_ENCODING,
  XML_ERROR_INCORRECT_ENCODING,
  XML_ERROR_UNCLOSED_CDATA_SECTION,
  XML_ERROR_EXTERNAL_ENTITY_HANDLING,
  XML_ERROR_NOT_STANDALONE,
  XML_ERROR_UNEXPECTED_STATE,
  XML_ERROR_ENTITY_DECLARED_IN_PE,
  XML_ERROR_FEATURE_REQUIRES_XML_DTD,
  XML_ERROR_CANT_CHANGE_FEATURE_ONCE_PARSING,
  XML_ERROR_UNBOUND_PREFIX,
  XML_ERROR_UNDECLARING_PREFIX,
  XML_ERROR_INCOMPLETE_PE,
  XML_ERROR_XML_DECL,
  XML_ERROR_TEXT_DECL,
  XML_ERROR_PUBLICID,
  XML_ERROR_SUSPENDED,
  XML_ERROR_NOT_SUSPENDED,
  XML_ERROR_ABORTED,
  XML_ERROR_FINISHED,
  XML_ERROR_SUSPEND_PE
};

enum XML_Content_Type {
  XML_CTYPE_EMPTY = 1,
  XML_CTYPE_ANY,
  XML_CTYPE_MIXED,
  XML_CTYPE_NAME,
  XML_CTYPE_CHOICE,
  XML_CTYPE_SEQ
};

enum XML_Content_Quant {
  XML_CQUANT_NONE,
  XML_CQUANT_OPT,
  XML_CQUANT_REP,
  XML_CQUANT_PLUS
};

typedef struct XML_cp XML_Content;

struct XML_cp {
  enum XML_Content_Type         type;
  enum XML_Content_Quant        quant;
  XML_Char *                    name;
  unsigned int                  numchildren;
  XML_Content *                 children;
};


typedef void (*XML_ElementDeclHandler) (void *userData,
                                        const XML_Char *name,
                                        XML_Content *model);

void
XML_SetElementDeclHandler(XML_Parser parser,
                          XML_ElementDeclHandler eldecl);

typedef void (*XML_AttlistDeclHandler) (
                                    void            *userData,
                                    const XML_Char  *elname,
                                    const XML_Char  *attname,
                                    const XML_Char  *att_type,
                                    const XML_Char  *dflt,
                                    int              isrequired);

void
XML_SetAttlistDeclHandler(XML_Parser parser,
                          XML_AttlistDeclHandler attdecl);

typedef void (*XML_XmlDeclHandler) (void *userData,
                                    const XML_Char *version,
                                    const XML_Char *encoding,
                                    int             standalone);

void
XML_SetXmlDeclHandler(XML_Parser parser,
                      XML_XmlDeclHandler xmldecl);


typedef struct {
  void *(*malloc_fcn)(size_t size);
  void *(*realloc_fcn)(void *ptr, size_t size);
  void (*free_fcn)(void *ptr);
} XML_Memory_Handling_Suite;

XML_Parser
XML_ParserCreate(const XML_Char *encoding);

XML_Parser
XML_ParserCreateNS(const XML_Char *encoding, XML_Char namespaceSeparator);


XML_Parser
XML_ParserCreate_MM(const XML_Char *encoding,
                    const XML_Memory_Handling_Suite *memsuite,
                    const XML_Char *namespaceSeparator);

XML_Bool
XML_ParserReset(XML_Parser parser, const XML_Char *encoding);

typedef void (*XML_StartElementHandler) (void *userData,
                                         const XML_Char *name,
                                         const XML_Char **atts);

typedef void (*XML_EndElementHandler) (void *userData,
                                       const XML_Char *name);


typedef void (*XML_CharacterDataHandler) (void *userData,
                                          const XML_Char *s,
                                          int len);

typedef void (*XML_ProcessingInstructionHandler) (
                                                void *userData,
                                                const XML_Char *target,
                                                const XML_Char *data);

typedef void (*XML_CommentHandler) (void *userData,
                                    const XML_Char *data);

typedef void (*XML_StartCdataSectionHandler) (void *userData);
typedef void (*XML_EndCdataSectionHandler) (void *userData);

typedef void (*XML_DefaultHandler) (void *userData,
                                    const XML_Char *s,
                                    int len);

typedef void (*XML_StartDoctypeDeclHandler) (
                                            void *userData,
                                            const XML_Char *doctypeName,
                                            const XML_Char *sysid,
                                            const XML_Char *pubid,
                                            int has_internal_subset);

typedef void (*XML_EndDoctypeDeclHandler)(void *userData);

typedef void (*XML_EntityDeclHandler) (
                              void *userData,
                              const XML_Char *entityName,
                              int is_parameter_entity,
                              const XML_Char *value,
                              int value_length,
                              const XML_Char *base,
                              const XML_Char *systemId,
                              const XML_Char *publicId,
                              const XML_Char *notationName);

void
XML_SetEntityDeclHandler(XML_Parser parser,
                         XML_EntityDeclHandler handler);

typedef void (*XML_UnparsedEntityDeclHandler) (
                                    void *userData,
                                    const XML_Char *entityName,
                                    const XML_Char *base,
                                    const XML_Char *systemId,
                                    const XML_Char *publicId,
                                    const XML_Char *notationName);

typedef void (*XML_NotationDeclHandler) (
                                    void *userData,
                                    const XML_Char *notationName,
                                    const XML_Char *base,
                                    const XML_Char *systemId,
                                    const XML_Char *publicId);

typedef void (*XML_StartNamespaceDeclHandler) (
                                    void *userData,
                                    const XML_Char *prefix,
                                    const XML_Char *uri);

typedef void (*XML_EndNamespaceDeclHandler) (
                                    void *userData,
                                    const XML_Char *prefix);

typedef int (*XML_NotStandaloneHandler) (void *userData);

typedef int (*XML_ExternalEntityRefHandler) (
                                    XML_Parser parser,
                                    const XML_Char *context,
                                    const XML_Char *base,
                                    const XML_Char *systemId,
                                    const XML_Char *publicId);

typedef void (*XML_SkippedEntityHandler) (
                                    void *userData,
                                    const XML_Char *entityName,
                                    int is_parameter_entity);

typedef struct {
  int map[256];
  void *data;
  int (*convert)(void *data, const char *s);
  void (*release)(void *data);
} XML_Encoding;

typedef int (*XML_UnknownEncodingHandler) (
                                    void *encodingHandlerData,
                                    const XML_Char *name,
                                    XML_Encoding *info);

void
XML_SetElementHandler(XML_Parser parser,
                      XML_StartElementHandler start,
                      XML_EndElementHandler end);

void
XML_SetStartElementHandler(XML_Parser parser,
                           XML_StartElementHandler handler);

void
XML_SetEndElementHandler(XML_Parser parser,
                         XML_EndElementHandler handler);

void
XML_SetCharacterDataHandler(XML_Parser parser,
                            XML_CharacterDataHandler handler);

void
XML_SetProcessingInstructionHandler(XML_Parser parser,
                                    XML_ProcessingInstructionHandler handler);
void
XML_SetCommentHandler(XML_Parser parser,
                      XML_CommentHandler handler);

void
XML_SetCdataSectionHandler(XML_Parser parser,
                           XML_StartCdataSectionHandler start,
                           XML_EndCdataSectionHandler end);

void
XML_SetStartCdataSectionHandler(XML_Parser parser,
                                XML_StartCdataSectionHandler start);

void
XML_SetEndCdataSectionHandler(XML_Parser parser,
                              XML_EndCdataSectionHandler end);

void
XML_SetDefaultHandler(XML_Parser parser,
                      XML_DefaultHandler handler);

void
XML_SetDefaultHandlerExpand(XML_Parser parser,
                            XML_DefaultHandler handler);

void
XML_SetDoctypeDeclHandler(XML_Parser parser,
                          XML_StartDoctypeDeclHandler start,
                          XML_EndDoctypeDeclHandler end);

void
XML_SetStartDoctypeDeclHandler(XML_Parser parser,
                               XML_StartDoctypeDeclHandler start);

void
XML_SetEndDoctypeDeclHandler(XML_Parser parser,
                             XML_EndDoctypeDeclHandler end);

void
XML_SetUnparsedEntityDeclHandler(XML_Parser parser,
                                 XML_UnparsedEntityDeclHandler handler);

void
XML_SetNotationDeclHandler(XML_Parser parser,
                           XML_NotationDeclHandler handler);

void
XML_SetNamespaceDeclHandler(XML_Parser parser,
                            XML_StartNamespaceDeclHandler start,
                            XML_EndNamespaceDeclHandler end);

void
XML_SetStartNamespaceDeclHandler(XML_Parser parser,
                                 XML_StartNamespaceDeclHandler start);

void
XML_SetEndNamespaceDeclHandler(XML_Parser parser,
                               XML_EndNamespaceDeclHandler end);

void
XML_SetNotStandaloneHandler(XML_Parser parser,
                            XML_NotStandaloneHandler handler);

void
XML_SetExternalEntityRefHandler(XML_Parser parser,
                                XML_ExternalEntityRefHandler handler);

void
XML_SetExternalEntityRefHandlerArg(XML_Parser parser,
                                   void *arg);

void
XML_SetSkippedEntityHandler(XML_Parser parser,
                            XML_SkippedEntityHandler handler);

void
XML_SetUnknownEncodingHandler(XML_Parser parser,
                              XML_UnknownEncodingHandler handler,
                              void *encodingHandlerData);

void
XML_DefaultCurrent(XML_Parser parser);

void
XML_SetReturnNSTriplet(XML_Parser parser, int do_nst);

void
XML_SetUserData(XML_Parser parser, void *userData);

#define XML_GetUserData(parser) (*(void **)(parser))

enum XML_Status
XML_SetEncoding(XML_Parser parser, const XML_Char *encoding);

void
XML_UseParserAsHandlerArg(XML_Parser parser);

enum XML_Error
XML_UseForeignDTD(XML_Parser parser, XML_Bool useDTD);


enum XML_Status
XML_SetBase(XML_Parser parser, const XML_Char *base);

const XML_Char *
XML_GetBase(XML_Parser parser);

int
XML_GetSpecifiedAttributeCount(XML_Parser parser);

int
XML_GetIdAttributeIndex(XML_Parser parser);

enum XML_Status
XML_Parse(XML_Parser parser, const char *s, int len, int isFinal);

void *
XML_GetBuffer(XML_Parser parser, int len);

enum XML_Status
XML_ParseBuffer(XML_Parser parser, int len, int isFinal);

enum XML_Status
XML_StopParser(XML_Parser parser, XML_Bool resumable);

enum XML_Status
XML_ResumeParser(XML_Parser parser);

enum XML_Parsing {
  XML_INITIALIZED,
  XML_PARSING,
  XML_FINISHED,
  XML_SUSPENDED
};

typedef struct {
  enum XML_Parsing parsing;
  XML_Bool finalBuffer;
} XML_ParsingStatus;

void
XML_GetParsingStatus(XML_Parser parser, XML_ParsingStatus *status);

XML_Parser
XML_ExternalEntityParserCreate(XML_Parser parser,
                               const XML_Char *context,
                               const XML_Char *encoding);

enum XML_ParamEntityParsing {
  XML_PARAM_ENTITY_PARSING_NEVER,
  XML_PARAM_ENTITY_PARSING_UNLESS_STANDALONE,
  XML_PARAM_ENTITY_PARSING_ALWAYS
};

int
XML_SetParamEntityParsing(XML_Parser parser,
                          enum XML_ParamEntityParsing parsing);

enum XML_Error
XML_GetErrorCode(XML_Parser parser);

int XML_GetCurrentLineNumber(XML_Parser parser);
int XML_GetCurrentColumnNumber(XML_Parser parser);
long XML_GetCurrentByteIndex(XML_Parser parser);

int
XML_GetCurrentByteCount(XML_Parser parser);

const char *
XML_GetInputContext(XML_Parser parser,
                    int *offset,
                    int *size);

#define XML_GetErrorLineNumber   XML_GetCurrentLineNumber
#define XML_GetErrorColumnNumber XML_GetCurrentColumnNumber
#define XML_GetErrorByteIndex    XML_GetCurrentByteIndex

void
XML_FreeContentModel(XML_Parser parser, XML_Content *model);

void *
XML_MemMalloc(XML_Parser parser, size_t size);

void *
XML_MemRealloc(XML_Parser parser, void *ptr, size_t size);

void
XML_MemFree(XML_Parser parser, void *ptr);

void
XML_ParserFree(XML_Parser parser);

const XML_LChar *
XML_ErrorString(enum XML_Error code);

const XML_LChar *
XML_ExpatVersion(void);

typedef struct {
  int major;
  int minor;
  int micro;
} XML_Expat_Version;

XML_Expat_Version 
XML_ExpatVersionInfo(void);

enum XML_FeatureEnum {
  XML_FEATURE_END = 0,
  XML_FEATURE_UNICODE,
  XML_FEATURE_UNICODE_WCHAR_T,
  XML_FEATURE_DTD,
  XML_FEATURE_CONTEXT_BYTES,
  XML_FEATURE_MIN_SIZE,
  XML_FEATURE_SIZEOF_XML_CHAR,
  XML_FEATURE_SIZEOF_XML_LCHAR
};

typedef struct {
  enum XML_FeatureEnum  feature;
  const XML_LChar       *name;
  long int              value;
} XML_Feature;

const XML_Feature *
XML_GetFeatureList(void);


#define XML_MAJOR_VERSION 1
#define XML_MINOR_VERSION 95
#define XML_MICRO_VERSION 8


/****************************************************************************/

#ifdef __GNUC__
   #ifdef __PPC__
    #pragma pack()
   #endif
#elif defined(__VBCC__)
   #pragma default-align
#endif

#ifdef __cplusplus
}
#endif

/****************************************************************************/

#endif  /* EXPAT_EXPAT_H */


From ssolie at users.sourceforge.net  Sat Dec 24 07:52:37 2005
From: ssolie at users.sourceforge.net (Steven Solie)
Date: Sat, 24 Dec 2005 07:52:37 +0100 (CET)
Subject: [Expat-checkins] expat/examples elements.c, 1.5, 1.6 outline.c, 1.5,
	1.6
Message-ID: <20051224065237.3C2B61E4002@bag.python.org>

Update of /cvsroot/expat/expat/examples
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4125

Modified Files:
	elements.c outline.c 
Log Message:


Index: elements.c
===================================================================
RCS file: /cvsroot/expat/expat/examples/elements.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- elements.c	10 Aug 2004 18:06:29 -0000	1.5
+++ elements.c	24 Dec 2005 06:52:33 -0000	1.6
@@ -25,8 +25,14 @@
   *depthPtr -= 1;
 }
 
+#ifdef AMIGA_SHARED_LIB
+#include <proto/expat.h>
+int
+amiga_main(int argc, char *argv[])
+#else
 int
 main(int argc, char *argv[])
+#endif
 {
   char buf[BUFSIZ];
   XML_Parser parser = XML_ParserCreate(NULL);

Index: outline.c
===================================================================
RCS file: /cvsroot/expat/expat/examples/outline.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- outline.c	15 Oct 2003 16:25:43 -0000	1.5
+++ outline.c	24 Dec 2005 06:52:33 -0000	1.6
@@ -54,8 +54,14 @@
   Depth--;
 }
 
+#ifdef AMIGA_SHARED_LIB
+#include <proto/expat.h>
+int
+amiga_main(int argc, char *argv[])
+#else
 int
 main(int argc, char *argv[])
+#endif
 {
   XML_Parser p = XML_ParserCreate(NULL);
   if (! p) {


From ssolie at users.sourceforge.net  Sat Dec 24 17:21:40 2005
From: ssolie at users.sourceforge.net (Steven Solie)
Date: Sat, 24 Dec 2005 17:21:40 +0100 (CET)
Subject: [Expat-checkins] expat MANIFEST,1.23,1.24
Message-ID: <20051224162140.7BA7C1E4002@bag.python.org>

Update of /cvsroot/expat/expat
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20834

Modified Files:
	MANIFEST 
Log Message:


Index: MANIFEST
===================================================================
RCS file: /cvsroot/expat/expat/MANIFEST,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- MANIFEST	29 Jan 2005 02:55:53 -0000	1.23
+++ MANIFEST	24 Dec 2005 16:21:35 -0000	1.24
@@ -114,3 +114,21 @@
 xmlwf/xmlwf.c
 xmlwf/xmlwf.dsp
 xmlwf/xmlwin32url.cxx
+amiga/libs
+amiga/lib
+amiga/include
+amiga/stdlib.c
+amiga/launch.c
+amiga/expat_vectors.c
+amiga/expat_lib.c
+amiga/expat.xml
+amiga/README.txt
+amiga/Makefile
+amiga/include/proto
+amiga/include/libraries
+amiga/include/interfaces
+amiga/include/inline4
+amiga/include/proto/expat.h
+amiga/include/libraries/expat.h
+amiga/include/interfaces/expat.h
+amiga/include/inline4/expat.h


From ssolie at users.sourceforge.net  Sat Dec 24 18:35:56 2005
From: ssolie at users.sourceforge.net (Steven Solie)
Date: Sat, 24 Dec 2005 18:35:56 +0100 (CET)
Subject: [Expat-checkins] expat MANIFEST,1.24,1.25
Message-ID: <20051224173556.7DF371E4002@bag.python.org>

Update of /cvsroot/expat/expat
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31098

Modified Files:
	MANIFEST 
Log Message:


Index: MANIFEST
===================================================================
RCS file: /cvsroot/expat/expat/MANIFEST,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- MANIFEST	24 Dec 2005 16:21:35 -0000	1.24
+++ MANIFEST	24 Dec 2005 17:35:51 -0000	1.25
@@ -1,3 +1,21 @@
+amiga/libs
+amiga/lib
+amiga/include
+amiga/stdlib.c
+amiga/launch.c
+amiga/expat_vectors.c
+amiga/expat_lib.c
+amiga/expat.xml
+amiga/README.txt
+amiga/Makefile
+amiga/include/proto
+amiga/include/libraries
+amiga/include/interfaces
+amiga/include/inline4
+amiga/include/proto/expat.h
+amiga/include/libraries/expat.h
+amiga/include/interfaces/expat.h
+amiga/include/inline4/expat.h
 bcb5/README.txt
 bcb5/all_projects.bpg
 bcb5/elements.bpf
@@ -114,21 +132,3 @@
 xmlwf/xmlwf.c
 xmlwf/xmlwf.dsp
 xmlwf/xmlwin32url.cxx
-amiga/libs
-amiga/lib
-amiga/include
-amiga/stdlib.c
-amiga/launch.c
-amiga/expat_vectors.c
-amiga/expat_lib.c
-amiga/expat.xml
-amiga/README.txt
-amiga/Makefile
-amiga/include/proto
-amiga/include/libraries
-amiga/include/interfaces
-amiga/include/inline4
-amiga/include/proto/expat.h
-amiga/include/libraries/expat.h
-amiga/include/interfaces/expat.h
-amiga/include/inline4/expat.h


From kwaclaw at users.sourceforge.net  Sun Dec 25 17:50:58 2005
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Sun, 25 Dec 2005 17:50:58 +0100 (CET)
Subject: [Expat-checkins] expat/lib xmltok_impl.c,1.11,1.12
Message-ID: <20051225165058.177461E4016@bag.python.org>

Update of /cvsroot/expat/expat/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15790

Modified Files:
	xmltok_impl.c 
Log Message:
Fixed incorrect cast which would cause 64-bit integers not to be set to a 64-bit -1 value.

Index: xmltok_impl.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmltok_impl.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- xmltok_impl.c	28 Nov 2005 20:02:36 -0000	1.11
+++ xmltok_impl.c	25 Dec 2005 16:50:52 -0000	1.12
@@ -1750,7 +1750,7 @@
     LEAD_CASE(2) LEAD_CASE(3) LEAD_CASE(4)
 #undef LEAD_CASE
     case BT_LF:
-      pos->columnNumber = (unsigned)-1;
+      pos->columnNumber = (XML_Size)-1;
       pos->lineNumber++;
       ptr += MINBPC(enc);
       break;
@@ -1759,7 +1759,7 @@
       ptr += MINBPC(enc);
       if (ptr != end && BYTE_TYPE(enc, ptr) == BT_LF)
         ptr += MINBPC(enc);
-      pos->columnNumber = (unsigned)-1;
+      pos->columnNumber = (XML_Size)-1;
       break;
     default:
       ptr += MINBPC(enc);


From kwaclaw at users.sourceforge.net  Sun Dec 25 17:52:16 2005
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Sun, 25 Dec 2005 17:52:16 +0100 (CET)
Subject: [Expat-checkins] expat/lib expat_external.h,1.4,1.5
Message-ID: <20051225165216.8FA4A1E4002@bag.python.org>

Update of /cvsroot/expat/expat/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15925

Modified Files:
	expat_external.h 
Log Message:
Added 64-bit support for MS VC++ 6.0.

Index: expat_external.h
===================================================================
RCS file: /cvsroot/expat/expat/lib/expat_external.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- expat_external.h	23 Dec 2005 14:45:27 -0000	1.4
+++ expat_external.h	25 Dec 2005 16:52:13 -0000	1.5
@@ -94,9 +94,14 @@
 typedef char XML_LChar;
 #endif /* XML_UNICODE */
 
-#ifdef XML_LARGE_SIZE  /* Use large integers for counts and positions. */
+#ifdef XML_LARGE_SIZE  /* Use large integers for file/stream positions. */
+#if defined(XML_USE_MSC_EXTENSIONS) && _MSC_VER < 1400
+typedef __int64 XML_Index; 
+typedef unsigned __int64 XML_Size;
+#else
 typedef long long XML_Index;
 typedef unsigned long long XML_Size;
+#endif
 #else
 typedef long XML_Index;
 typedef unsigned long XML_Size;


From kwaclaw at users.sourceforge.net  Sun Dec 25 17:54:14 2005
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Sun, 25 Dec 2005 17:54:14 +0100 (CET)
Subject: [Expat-checkins] expat/xmlwf xmlfile.h,1.7,1.8
Message-ID: <20051225165414.0870B1E4002@bag.python.org>

Update of /cvsroot/expat/expat/xmlwf
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16132

Modified Files:
	xmlfile.h 
Log Message:
Added integer modifier macro to support 64-bit integers in printf.

Index: xmlfile.h
===================================================================
RCS file: /cvsroot/expat/expat/xmlwf/xmlfile.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- xmlfile.h	1 Jul 2002 15:18:34 -0000	1.7
+++ xmlfile.h	25 Dec 2005 16:54:10 -0000	1.8
@@ -5,6 +5,16 @@
 #define XML_MAP_FILE 01
 #define XML_EXTERNAL_ENTITIES 02
 
+#ifdef XML_LARGE_SIZE
+#if defined(XML_USE_MSC_EXTENSIONS) && _MSC_VER < 1400
+#define XML_FMT_INT_MOD "I64"
+#else
+#define XML_FMT_INT_MOD "ll"
+#endif
+#else
+#define XML_FMT_INT_MOD "l"
+#endif
+
 extern int XML_ProcessFile(XML_Parser parser,
                            const XML_Char *filename,
                            unsigned flags);


From kwaclaw at users.sourceforge.net  Sun Dec 25 17:56:09 2005
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Sun, 25 Dec 2005 17:56:09 +0100 (CET)
Subject: [Expat-checkins] expat/xmlwf xmlwf.c,1.68,1.69
Message-ID: <20051225165609.ABB891E4002@bag.python.org>

Update of /cvsroot/expat/expat/xmlwf
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16319

Modified Files:
	xmlwf.c 
Log Message:
* Added integer modifier macro to support 64-bit integers in printf.
* Made include directives to be in sync with xmlparse.c.

Index: xmlwf.c
===================================================================
RCS file: /cvsroot/expat/expat/xmlwf/xmlwf.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- xmlwf.c	24 Dec 2005 06:35:04 -0000	1.68
+++ xmlwf.c	25 Dec 2005 16:56:05 -0000	1.69
@@ -7,6 +7,16 @@
 #include <stddef.h>
 #include <string.h>
 
+#ifdef COMPILED_FROM_DSP
+#include "winconfig.h"
+#elif defined(MACOS_CLASSIC)
+#include "macconfig.h"
+#elif defined(__amigaos4__)
+#include "amigaconfig.h"
+#elif defined(HAVE_EXPAT_CONFIG_H)
+#include <expat_config.h>
+#endif /* ndef COMPILED_FROM_DSP */
+
 #include "expat.h"
 #include "codepage.h"
 #include "xmlfile.h"
@@ -309,7 +319,8 @@
   if (uri)
     ftprintf((FILE *)XML_GetUserData(parser), T(" uri=\"%s\""), uri);
   ftprintf((FILE *)XML_GetUserData(parser),
-           T(" byte=\"%ld\" nbytes=\"%d\" line=\"%d\" col=\"%d\""),
+           T(" byte=\"%" XML_FMT_INT_MOD "d\" nbytes=\"%d\" \
+			 line=\"%" XML_FMT_INT_MOD "u\" col=\"%" XML_FMT_INT_MOD "u\""),
            XML_GetCurrentByteIndex(parser),
            XML_GetCurrentByteCount(parser),
            XML_GetCurrentLineNumber(parser),


From kwaclaw at users.sourceforge.net  Sun Dec 25 18:05:13 2005
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Sun, 25 Dec 2005 18:05:13 +0100 (CET)
Subject: [Expat-checkins] expat/xmlwf xmlfile.c,1.15,1.16
Message-ID: <20051225170513.C94361E4002@bag.python.org>

Update of /cvsroot/expat/expat/xmlwf
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17685

Modified Files:
	xmlfile.c 
Log Message:
* Added integer modifier macro to support 64-bit integers in printf.
* Made include directives of configuration header files sync'ed
  with xmlparse.c.

Index: xmlfile.c
===================================================================
RCS file: /cvsroot/expat/expat/xmlwf/xmlfile.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- xmlfile.c	24 Dec 2005 06:35:35 -0000	1.15
+++ xmlfile.c	25 Dec 2005 17:05:10 -0000	1.16
@@ -7,13 +7,17 @@
 #include <stddef.h>
 #include <string.h>
 #include <fcntl.h>
+
 #ifdef COMPILED_FROM_DSP
 #include "winconfig.h"
-#else
-#ifdef HAVE_EXPAT_CONFIG_H
-#include "expat_config.h"
-#endif
-#endif
+#elif defined(MACOS_CLASSIC)
+#include "macconfig.h"
+#elif defined(__amigaos4__)
+#include "amigaconfig.h"
+#elif defined(HAVE_EXPAT_CONFIG_H)
+#include <expat_config.h>
+#endif /* ndef COMPILED_FROM_DSP */
+
 #include "expat.h"
 #include "xmlfile.h"
 #include "xmltchar.h"
@@ -57,7 +61,7 @@
   enum XML_Error code = XML_GetErrorCode(parser);
   const XML_Char *message = XML_ErrorString(code);
   if (message)
-    ftprintf(stdout, T("%s:%d:%d: %s\n"),
+    ftprintf(stdout, T("%s:%" XML_FMT_INT_MOD "u:%" XML_FMT_INT_MOD "u: %s\n"),
              filename,
              XML_GetErrorLineNumber(parser),
              XML_GetErrorColumnNumber(parser),


From kwaclaw at users.sourceforge.net  Sun Dec 25 18:06:25 2005
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Sun, 25 Dec 2005 18:06:25 +0100 (CET)
Subject: [Expat-checkins] expat/xmlwf xmlwf.c,1.69,1.70
Message-ID: <20051225170625.B5BE11E401B@bag.python.org>

Update of /cvsroot/expat/expat/xmlwf
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17811

Modified Files:
	xmlwf.c 
Log Message:
Removed newly added include directives of configuration header files.
They seem to be unnecessary.

Index: xmlwf.c
===================================================================
RCS file: /cvsroot/expat/expat/xmlwf/xmlwf.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- xmlwf.c	25 Dec 2005 16:56:05 -0000	1.69
+++ xmlwf.c	25 Dec 2005 17:06:22 -0000	1.70
@@ -7,16 +7,6 @@
 #include <stddef.h>
 #include <string.h>
 
-#ifdef COMPILED_FROM_DSP
-#include "winconfig.h"
-#elif defined(MACOS_CLASSIC)
-#include "macconfig.h"
-#elif defined(__amigaos4__)
-#include "amigaconfig.h"
-#elif defined(HAVE_EXPAT_CONFIG_H)
-#include <expat_config.h>
-#endif /* ndef COMPILED_FROM_DSP */
-
 #include "expat.h"
 #include "codepage.h"
 #include "xmlfile.h"


From kwaclaw at users.sourceforge.net  Mon Dec 26 16:43:27 2005
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Mon, 26 Dec 2005 16:43:27 +0100 (CET)
Subject: [Expat-checkins] expat/lib expat.h,1.77,1.78
Message-ID: <20051226154327.8D5B11E4002@bag.python.org>

Update of /cvsroot/expat/expat/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14541

Modified Files:
	expat.h 
Log Message:
Bumped version number to 2.0.0.

Index: expat.h
===================================================================
RCS file: /cvsroot/expat/expat/lib/expat.h,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- expat.h	23 Dec 2005 14:45:27 -0000	1.77
+++ expat.h	26 Dec 2005 15:43:22 -0000	1.78
@@ -1002,9 +1002,9 @@
    releases. Micro is bumped with each release, and set to 0 with each
    change to major or minor version.
 */
-#define XML_MAJOR_VERSION 1
-#define XML_MINOR_VERSION 95
-#define XML_MICRO_VERSION 8
+#define XML_MAJOR_VERSION 2
+#define XML_MINOR_VERSION 0
+#define XML_MICRO_VERSION 0
 
 #ifdef __cplusplus
 }


From kwaclaw at users.sourceforge.net  Mon Dec 26 19:08:24 2005
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Mon, 26 Dec 2005 19:08:24 +0100 (CET)
Subject: [Expat-checkins] expat/doc reference.html,1.68,1.69
Message-ID: <20051226180824.03BFC1E4002@bag.python.org>

Update of /cvsroot/expat/expat/doc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10506

Modified Files:
	reference.html 
Log Message:
Updated release version.

Index: reference.html
===================================================================
RCS file: /cvsroot/expat/expat/doc/reference.html,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- reference.html	23 Dec 2005 14:45:27 -0000	1.68
+++ reference.html	26 Dec 2005 18:08:19 -0000	1.69
@@ -19,7 +19,7 @@
       <td class="banner"><h1>The Expat XML Parser</h1></td>
     </tr>
     <tr>
-      <td class="releaseno">Release 1.95.8</td>
+      <td class="releaseno">Release 2.0.0</td>
       <td></td>
     </tr>
   </table>


From kwaclaw at users.sourceforge.net  Mon Dec 26 20:36:27 2005
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Mon, 26 Dec 2005 20:36:27 +0100 (CET)
Subject: [Expat-checkins] expat/win32 README.txt,1.5,1.6
Message-ID: <20051226193627.7B4CB1E4002@bag.python.org>

Update of /cvsroot/expat/expat/win32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25599

Modified Files:
	README.txt 
Log Message:
Added info about VS 2005.

Index: README.txt
===================================================================
RCS file: /cvsroot/expat/expat/win32/README.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- README.txt	28 Nov 2005 18:42:49 -0000	1.5
+++ README.txt	26 Dec 2005 19:36:21 -0000	1.6
@@ -13,7 +13,7 @@
   Based on the workspace file expat.dsw. The related project
   files (.dsp) are located in the lib subdirectory.
 
-* MS Visual Studio .NET 2002, 2003:
+* MS Visual Studio .NET 2002, 2003, 2005:
   The VC++ 6 workspace file (expat.dsw) and project files (.dsp)
   can be opened and imported in VS.NET without problems.
   
@@ -56,6 +56,9 @@
   Multi-threaded Dll: libexpat(w)MD.lib
   The suffixes conform to the compiler switch settings
   /ML, /MT and /MD for MS VC++.
+  
+  Note: In Visual Studio 2005 (Visual C++ 8.0) and later, the
+  single-threaded runtime library is not supported anymore.
 
   By default, the expat-static and expatw-static projects are set up
   to link statically against the multithreaded run-time library,


From kwaclaw at users.sourceforge.net  Mon Dec 26 20:38:42 2005
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Mon, 26 Dec 2005 20:38:42 +0100 (CET)
Subject: [Expat-checkins] expat/win32 MANIFEST.txt,1.5,1.6
Message-ID: <20051226193842.63F8F1E4002@bag.python.org>

Update of /cvsroot/expat/expat/win32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25863

Modified Files:
	MANIFEST.txt 
Log Message:
Updated for new setup application.

Index: MANIFEST.txt
===================================================================
RCS file: /cvsroot/expat/expat/win32/MANIFEST.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- MANIFEST.txt	25 Jan 2003 16:25:34 -0000	1.5
+++ MANIFEST.txt	26 Dec 2005 19:38:38 -0000	1.6
@@ -26,4 +26,4 @@
     <top>\Source\bcb5\  Project files for Borland C++ Builder 5 and BCC
                         5.5.
 
-    <top>\Unistall\     The uninstaller and its data files.
+


From kwaclaw at users.sourceforge.net  Tue Dec 27 05:49:53 2005
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Tue, 27 Dec 2005 05:49:53 +0100 (CET)
Subject: [Expat-checkins] expat MANIFEST,1.25,1.26
Message-ID: <20051227044953.9547B1E4002@bag.python.org>

Update of /cvsroot/expat/expat
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11413

Modified Files:
	MANIFEST 
Log Message:
Removed empty amiga directories.

Index: MANIFEST
===================================================================
RCS file: /cvsroot/expat/expat/MANIFEST,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- MANIFEST	24 Dec 2005 17:35:51 -0000	1.25
+++ MANIFEST	27 Dec 2005 04:49:49 -0000	1.26
@@ -1,5 +1,3 @@
-amiga/libs
-amiga/lib
 amiga/include
 amiga/stdlib.c
 amiga/launch.c


From ssolie at users.sourceforge.net  Tue Dec 27 16:45:35 2005
From: ssolie at users.sourceforge.net (Steven Solie)
Date: Tue, 27 Dec 2005 16:45:35 +0100 (CET)
Subject: [Expat-checkins] expat/amiga README.txt,1.2,1.3
Message-ID: <20051227154535.1E8561E4002@bag.python.org>

Update of /cvsroot/expat/expat/amiga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12113

Modified Files:
	README.txt 
Log Message:


Index: README.txt
===================================================================
RCS file: /cvsroot/expat/expat/amiga/README.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- README.txt	24 Dec 2005 06:38:30 -0000	1.2
+++ README.txt	27 Dec 2005 15:45:30 -0000	1.3
@@ -14,6 +14,9 @@
 
 HISTORY
 =======
+4.0  - updated for corresponding Expat 2.0 release
+     - some minor CVS related changes
+
 3.1  - removed obsolete sfd file
      - added library description xml file
      - refactored Makefile


From ssolie at users.sourceforge.net  Tue Dec 27 16:47:35 2005
From: ssolie at users.sourceforge.net (Steven Solie)
Date: Tue, 27 Dec 2005 16:47:35 +0100 (CET)
Subject: [Expat-checkins] expat/amiga Makefile,1.2,1.3
Message-ID: <20051227154735.56B5D1E4002@bag.python.org>

Update of /cvsroot/expat/expat/amiga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12515

Modified Files:
	Makefile 
Log Message:
now creates required dirs

Index: Makefile
===================================================================
RCS file: /cvsroot/expat/expat/amiga/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	24 Dec 2005 06:38:10 -0000	1.2
+++ Makefile	27 Dec 2005 15:47:31 -0000	1.3
@@ -41,10 +41,11 @@
 	@echo " clib2 1.198"
 	@echo ""
 	@echo "Targets:"
-	@echo " all     - make expat libraries, xmlwf, examples and run test suite"
+	@echo " all - make expat libraries, xmlwf, examples and run test suite"
 	@echo " install - install expat libraries and tools into SDK"
 
 all:
+	-makedir lib libs
 	$(MAKE) staticlib
 	$(MAKE) sharedlib
 


From ssolie at users.sourceforge.net  Tue Dec 27 16:48:17 2005
From: ssolie at users.sourceforge.net (Steven Solie)
Date: Tue, 27 Dec 2005 16:48:17 +0100 (CET)
Subject: [Expat-checkins] expat/amiga expat_lib.c,1.1,1.2
Message-ID: <20051227154817.3312B1E4002@bag.python.org>

Update of /cvsroot/expat/expat/amiga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12615

Modified Files:
	expat_lib.c 
Log Message:
Bumped lib version for 4.0 release

Index: expat_lib.c
===================================================================
RCS file: /cvsroot/expat/expat/amiga/expat_lib.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- expat_lib.c	24 Dec 2005 06:39:56 -0000	1.1
+++ expat_lib.c	27 Dec 2005 15:48:13 -0000	1.2
@@ -26,9 +26,9 @@
 
 #define LIBNAME		"expat.library"
 #define LIBPRI		0
-#define VERSION		3
-#define REVISION	1
-#define VSTRING		"expat.library 3.1 (6.11.2005)"  /* dd.mm.yyyy */
+#define VERSION		4
+#define REVISION	0
+#define VSTRING		"expat.library 4.0 (27.12.2005)"  /* dd.mm.yyyy */
 
 
 static const char* __attribute__((used)) verstag = "\0$VER: " VSTRING;


From kwaclaw at users.sourceforge.net  Tue Dec 27 17:18:06 2005
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Tue, 27 Dec 2005 17:18:06 +0100 (CET)
Subject: [Expat-checkins] expat MANIFEST,1.26,1.27
Message-ID: <20051227161806.DED5C1E4002@bag.python.org>

Update of /cvsroot/expat/expat
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17679

Modified Files:
	MANIFEST 
Log Message:
Seems we don't have to specify directories.

Index: MANIFEST
===================================================================
RCS file: /cvsroot/expat/expat/MANIFEST,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- MANIFEST	27 Dec 2005 04:49:49 -0000	1.26
+++ MANIFEST	27 Dec 2005 16:18:03 -0000	1.27
@@ -1,4 +1,3 @@
-amiga/include
 amiga/stdlib.c
 amiga/launch.c
 amiga/expat_vectors.c


From kwaclaw at users.sourceforge.net  Tue Dec 27 17:20:29 2005
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Tue, 27 Dec 2005 17:20:29 +0100 (CET)
Subject: [Expat-checkins] expat MANIFEST,1.27,1.28
Message-ID: <20051227162029.01C841E4002@bag.python.org>

Update of /cvsroot/expat/expat
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18067

Modified Files:
	MANIFEST 
Log Message:
More directories to exclude.

Index: MANIFEST
===================================================================
RCS file: /cvsroot/expat/expat/MANIFEST,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- MANIFEST	27 Dec 2005 16:18:03 -0000	1.27
+++ MANIFEST	27 Dec 2005 16:20:26 -0000	1.28
@@ -5,10 +5,6 @@
 amiga/expat.xml
 amiga/README.txt
 amiga/Makefile
-amiga/include/proto
-amiga/include/libraries
-amiga/include/interfaces
-amiga/include/inline4
 amiga/include/proto/expat.h
 amiga/include/libraries/expat.h
 amiga/include/interfaces/expat.h


From kwaclaw at users.sourceforge.net  Tue Dec 27 17:49:49 2005
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Tue, 27 Dec 2005 17:49:49 +0100 (CET)
Subject: [Expat-checkins] htdocs index.html,1.58,1.59 oldnews.html,1.1,1.2
Message-ID: <20051227164949.B03981E4002@bag.python.org>

Update of /cvsroot/expat/htdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22489

Modified Files:
	index.html oldnews.html 
Log Message:
Added news item. Moved some older news into news archive.

Index: index.html
===================================================================
RCS file: /cvsroot/expat/htdocs/index.html,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- index.html	23 Dec 2005 16:47:23 -0000	1.58
+++ index.html	27 Dec 2005 16:49:44 -0000	1.59
@@ -51,6 +51,16 @@
 <h3 id="news">News</h3>
 
 <dl>
+  <dt><em>27 December 2005</em>,
+      Final Expat 2.0 pre-release snapshot made available.
+    </dt>
+  <dd>
+    <p>This <a href="http://www.libexpat.org/expat-2005-12-27.tar.gz" >
+    pre-release distribution</a> is based on the feedback we got from the
+    Dec. 23 snapshot and represents the final opportunity for
+    feedback before the actual release goes out.</p>
+    <p>We plan to release after the New Year.</p>
+    </dd>
   <dt><em>23 December 2005</em>,
       Expat 2.0 pre-release snapshot (another one) made available.
     </dt>
@@ -64,7 +74,6 @@
     feature to enable 64-bit integers on some API members. Please check
     how it builds and works for you.</p>
     </dd>
-
   <dt><em>28 January 2005</em>,
       Expat pre-release snapshot made available.
     </dt>
@@ -87,7 +96,7 @@
     work out.  As a compensation, we've fixed a number of the
     nuissance warnings generated on many platforms, and added a nice
     new suspend/resume feature to the parser.</p>
-    <ul>
+    <p><ul>
       <li> Major new feature: suspend/resume.  Handlers can now request
            that a parse be suspended for later resumption or aborted
            altogether.  See "Temporarily Stopping Parsing" in the
@@ -96,107 +105,7 @@
            longer generate warnings on most platforms.  SF issues
            include: 827319, 840173, 846309, 888329, 896188, 923913,
            928113, 961698, 985192.</li>
-    </ul>
-    </dd>
-  <dt><em>20 October 2003</em>,
-      Expat 1.95.7 released.
-    </dt>
-  <dd>
-    <ul>
-      <li> Fixed <code>enum XML_Status</code> issue (reported on
-           SourceForge many times), so compilers that are properly
-           picky will be happy. </li>
-      <li> Introduced an <code>XMLCALL</code> macro to control the
-           calling convention used by the Expat API; this macro should
-           be used to annotate prototypes and definitions of callback
-           implementations in code compiled with a calling convention
-           other than the default convention for the host
-           platform. </li>
-      <li> Improved ability to build without the
-           <b>configure</b>-generated <span
-           class="filename">expat_config.h</span> header.  This is
-           useful for applications which embed Expat rather than
-           linking in the library. </li>
-      <li> Fixed a variety of bugs: see SF issues 458907, 609603,
-           676844, 679754, 692878, 692964, 695401, 699323, 699487,
-           820946. </li>
-      <li> Improved hash table lookups. </li>
-      <li> Added more regression tests and improved documentation. </li>
-    </ul>
-    <p>Our plan is to wait for a short while and re-release this
-    version as the long-awaited Expat 2.0 if no major problems are
-    identified.  If significant problems are found, additional
-    iterative releases will be made as fixes are made.</p>
-    </dd>
-  <dt><em>15 October 2003</em>,
-      Upcoming release.
-    </dt>
-  <dd>
-    <p>We're working on getting the long-delayed Expat 1.95.7 out the
-      door.  A snapshot of the current source code is available as
-      expat-2003-10-15.tar.gz (no longer available);
-      please give this a try on your platform and report how it works
-      for you to the <a href=
-      "http://mail.libexpat.org/mailman/listinfo/expat-discuss"
-      >expat-discuss</a> mailing list.  Our goals for this release are
-      portability and stability.
-      </p>
-    </dd>
-  <dt><em>28 January 2003</em>,
-      Expat 1.95.6 released.
-    </dt>
-  <dd>
-    <ul>
-      <li> Added <code>XML_FreeContentModel()</code>. </li>
-      <li> Added <code>XML_MemMalloc()</code>,
-           <code>XML_MemRealloc()</code>,
-           <code>XML_MemFree()</code>. </li>
-      <li> Fixed a variety of bugs: see SF issues 615606, 616863,
-           618199, 653180, 673791. </li>
-      <li> Enhanced the regression test suite. </li>
-      <li> Man page improvements: includes SF issue 632146. </li>
-    </ul>
-    <p />
-    </dd>
-  <dt><em>6 September 2002</em>,
-      Expat 1.95.5 released.
-    </dt>
-  <dd>
-    <ul>
-      <li> Added <code>XML_UseForeignDTD()</code> for improved SAX2
-           support. </li>
-      <li> Added <code>XML_GetFeatureList()</code>. </li>
-      <li> Defined <code>XML_Bool</code> type and the values
-           <code>XML_TRUE</code> and <code>XML_FALSE</code>. </li>
-      <li> Use an incomplete struct instead of a <code>void*</code>
-           for the parser. </li>
-      <li> Fixed UTF-8 decoding bug that caused legal UTF-8 to be
-           rejected. </li>
-      <li> Finally fixed bug where default handler would report DTD
-           events that were already handled by another handler.
-           Initial patch contributed by Darryl Miles. </li>
-      <li> Removed unnecessary <code>DllMain()</code> function that
-           caused static linking into a DLL to be difficult. </li>
-      <li> Added VC++ projects for building static libraries. </li>
-      <li> Reduced line-length for all source code and headers to be
-           no longer than 80 characters, to help with AS/400
-           support. </li>
-      <li> Reduced memory copying during parsing (SF patch #600964). </li>
-      <li> Fixed a variety of bugs: see SF issues 580793, 434664,
-           483514, 580503, 581069, 584041, 584183, 584832, 585537,
-           596555, 596678, 598352, 598944, 599715, 600479, 600971. </li>
-    </ul>
-    <p />
-    </dd>
-  <dt><em>4 September 2002</em>,
-      <a href="dev/roadmap.html">Development roadmap</a> published.
-    </dt>
-  <dd>
-    <ul>
-      <li> The initial version of the development roadmap was released
-           for comment. </li>
-    </ul>
-    <p />
+    </ul></p>
     </dd>
 </dl>
 

Index: oldnews.html
===================================================================
RCS file: /cvsroot/expat/htdocs/oldnews.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- oldnews.html	27 Sep 2002 14:11:43 -0000	1.1
+++ oldnews.html	27 Dec 2005 16:49:44 -0000	1.2
@@ -17,6 +17,106 @@
 <p><a href="./index.html#news">Current news</a></p>
 
 <dl>
+  <dt><em>20 October 2003</em>,
+      Expat 1.95.7 released.
+    </dt>
+  <dd>
+    <p><ul>
+      <li> Fixed <code>enum XML_Status</code> issue (reported on
+           SourceForge many times), so compilers that are properly
+           picky will be happy. </li>
+      <li> Introduced an <code>XMLCALL</code> macro to control the
+           calling convention used by the Expat API; this macro should
+           be used to annotate prototypes and definitions of callback
+           implementations in code compiled with a calling convention
+           other than the default convention for the host
+           platform. </li>
+      <li> Improved ability to build without the
+           <b>configure</b>-generated <span
+           class="filename">expat_config.h</span> header.  This is
+           useful for applications which embed Expat rather than
+           linking in the library. </li>
+      <li> Fixed a variety of bugs: see SF issues 458907, 609603,
+           676844, 679754, 692878, 692964, 695401, 699323, 699487,
+           820946. </li>
+      <li> Improved hash table lookups. </li>
+      <li> Added more regression tests and improved documentation. </li>
+    </ul></p>
+    <p>Our plan is to wait for a short while and re-release this
+    version as the long-awaited Expat 2.0 if no major problems are
+    identified.  If significant problems are found, additional
+    iterative releases will be made as fixes are made.</p>
+    </dd>
+  <dt><em>15 October 2003</em>,
+      Upcoming release.
+    </dt>
+  <dd>
+    <p>We're working on getting the long-delayed Expat 1.95.7 out the
+      door.  A snapshot of the current source code is available as
+      expat-2003-10-15.tar.gz (no longer available);
+      please give this a try on your platform and report how it works
+      for you to the <a href=
+      "http://mail.libexpat.org/mailman/listinfo/expat-discuss"
+      >expat-discuss</a> mailing list.  Our goals for this release are
+      portability and stability.
+      </p>
+    </dd>
+  <dt><em>28 January 2003</em>,
+      Expat 1.95.6 released.
+    </dt>
+  <dd>
+    <ul>
+      <li> Added <code>XML_FreeContentModel()</code>. </li>
+      <li> Added <code>XML_MemMalloc()</code>,
+           <code>XML_MemRealloc()</code>,
+           <code>XML_MemFree()</code>. </li>
+      <li> Fixed a variety of bugs: see SF issues 615606, 616863,
+           618199, 653180, 673791. </li>
+      <li> Enhanced the regression test suite. </li>
+      <li> Man page improvements: includes SF issue 632146. </li>
+    </ul>
+    <p />
+    </dd>
+  <dt><em>6 September 2002</em>,
+      Expat 1.95.5 released.
+    </dt>
+  <dd>
+    <ul>
+      <li> Added <code>XML_UseForeignDTD()</code> for improved SAX2
+           support. </li>
+      <li> Added <code>XML_GetFeatureList()</code>. </li>
+      <li> Defined <code>XML_Bool</code> type and the values
+           <code>XML_TRUE</code> and <code>XML_FALSE</code>. </li>
+      <li> Use an incomplete struct instead of a <code>void*</code>
+           for the parser. </li>
+      <li> Fixed UTF-8 decoding bug that caused legal UTF-8 to be
+           rejected. </li>
+      <li> Finally fixed bug where default handler would report DTD
+           events that were already handled by another handler.
+           Initial patch contributed by Darryl Miles. </li>
+      <li> Removed unnecessary <code>DllMain()</code> function that
+           caused static linking into a DLL to be difficult. </li>
+      <li> Added VC++ projects for building static libraries. </li>
+      <li> Reduced line-length for all source code and headers to be
+           no longer than 80 characters, to help with AS/400
+           support. </li>
+      <li> Reduced memory copying during parsing (SF patch #600964). </li>
+      <li> Fixed a variety of bugs: see SF issues 580793, 434664,
+           483514, 580503, 581069, 584041, 584183, 584832, 585537,
+           596555, 596678, 598352, 598944, 599715, 600479, 600971. </li>
+    </ul>
+    <p />
+    </dd>
+  <dt><em>4 September 2002</em>,
+      <a href="dev/roadmap.html">Development roadmap</a> published.
+    </dt>
+  <dd>
+    <ul>
+      <li> The initial version of the development roadmap was released
+           for comment. </li>
+    </ul>
+    <p />
+    </dd>
   <dt><em>12 July 2002</em>,
       Expat 1.95.4 released.
     </dt>


From kwaclaw at users.sourceforge.net  Wed Dec 28 07:03:33 2005
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Wed, 28 Dec 2005 07:03:33 +0100 (CET)
Subject: [Expat-checkins] expat/tests README.txt,1.3,1.4
Message-ID: <20051228060333.2E0861E4002@bag.python.org>

Update of /cvsroot/expat/expat/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31590

Modified Files:
	README.txt 
Log Message:
Updated to reflect that we use our own Check implementation now.

Index: README.txt
===================================================================
RCS file: /cvsroot/expat/expat/tests/README.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- README.txt	9 Jul 2002 20:50:04 -0000	1.3
+++ README.txt	28 Dec 2005 06:03:29 -0000	1.4
@@ -3,12 +3,12 @@
 are not expected to be useful examples of Expat usage; see the
 examples/ directory for that.
 
-The Expat tests use the "Check" unit testing framework for C.  More
-information on Check can be found at:
+The Expat tests use a partial internal implementation of the "Check"
+unit testing framework for C. More information on Check can be found at:
 
         http://check.sourceforge.net/
 
-Check 0.8 must be installed before the unit tests can be compiled & run.
+Expat must be built and installed before "make check" can be executed.
 
 Since both Check and this test suite are young, it can all change in a
 later version.


From kwaclaw at users.sourceforge.net  Wed Dec 28 07:06:15 2005
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Wed, 28 Dec 2005 07:06:15 +0100 (CET)
Subject: [Expat-checkins] expat/tests runtests.c,1.61,1.62
Message-ID: <20051228060615.1C2A01E4017@bag.python.org>

Update of /cvsroot/expat/expat/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31830

Modified Files:
	runtests.c 
Log Message:
Adjusted to the new return type of XML_GetCurrentLineNumber
and XML_GetCurrentColumnNumber when XML_LARGE_SIZE is defined.

Index: runtests.c
===================================================================
RCS file: /cvsroot/expat/expat/tests/runtests.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- runtests.c	24 Dec 2005 06:33:50 -0000	1.61
+++ runtests.c	28 Dec 2005 06:06:11 -0000	1.62
@@ -21,6 +21,11 @@
 #include <proto/expat.h>
 #endif
 
+#ifdef XML_LARGE_SIZE
+#define XML_FMT_INT_MOD "ll"
+#else
+#define XML_FMT_INT_MOD "l"
+#endif
 
 static XML_Parser parser;
 
@@ -49,7 +54,8 @@
 {
     char buffer[1024];
     sprintf(buffer,
-            "\n    %s (line %d, offset %d)\n    reported from %s, line %d",
+            "\n    %s (line %" XML_FMT_INT_MOD "u, offset %"\
+                XML_FMT_INT_MOD "u)\n    reported from %s, line %d",
             XML_ErrorString(XML_GetErrorCode(parser)),
             XML_GetCurrentLineNumber(parser),
             XML_GetCurrentColumnNumber(parser),
@@ -401,14 +407,15 @@
         "<tag>\n"
         "\n"
         "\n</tag>";
-    int lineno;
+    XML_Size lineno;
 
     if (XML_Parse(parser, text, strlen(text), XML_FALSE) == XML_STATUS_ERROR)
         xml_failure(parser);
     lineno = XML_GetCurrentLineNumber(parser);
     if (lineno != 4) {
         char buffer[100];
-        sprintf(buffer, "expected 4 lines, saw %d", lineno);
+        sprintf(buffer, 
+            "expected 4 lines, saw %" XML_FMT_INT_MOD "u", lineno);
         fail(buffer);
     }
 }
@@ -418,14 +425,15 @@
 START_TEST(test_column_number_after_parse)
 {
     char *text = "<tag></tag>";
-    int colno;
+    XML_Size colno;
 
     if (XML_Parse(parser, text, strlen(text), XML_FALSE) == XML_STATUS_ERROR)
         xml_failure(parser);
     colno = XML_GetCurrentColumnNumber(parser);
     if (colno != 11) {
         char buffer[100];
-        sprintf(buffer, "expected 11 columns, saw %d", colno);
+        sprintf(buffer, 
+            "expected 11 columns, saw %" XML_FMT_INT_MOD "u", colno);
         fail(buffer);
     }
 }
@@ -438,7 +446,9 @@
     CharData *storage = (CharData *) userData;
     char buffer[100];
 
-    sprintf(buffer, "<%s> at col:%d line:%d\n", name,
+    sprintf(buffer,
+        "<%s> at col:%" XML_FMT_INT_MOD "u line:%"\
+            XML_FMT_INT_MOD "u\n", name,
 	    XML_GetCurrentColumnNumber(parser),
 	    XML_GetCurrentLineNumber(parser));
     CharData_AppendString(storage, buffer);
@@ -450,7 +460,9 @@
     CharData *storage = (CharData *) userData;
     char buffer[100];
 
-    sprintf(buffer, "</%s> at col:%d line:%d\n", name,
+    sprintf(buffer,
+        "</%s> at col:%" XML_FMT_INT_MOD "u line:%"\
+            XML_FMT_INT_MOD "u\n", name,
 	    XML_GetCurrentColumnNumber(parser),
 	    XML_GetCurrentLineNumber(parser));
     CharData_AppendString(storage, buffer);
@@ -499,14 +511,14 @@
         "<a>\n"
         "  <b>\n"
         "  </a>";  /* missing </b> */
-    int lineno;
+    XML_Size lineno;
     if (XML_Parse(parser, text, strlen(text), XML_FALSE) != XML_STATUS_ERROR)
         fail("Expected a parse error");
 
     lineno = XML_GetCurrentLineNumber(parser);
     if (lineno != 3) {
         char buffer[100];
-        sprintf(buffer, "expected 3 lines, saw %d", lineno);
+        sprintf(buffer, "expected 3 lines, saw %" XML_FMT_INT_MOD "u", lineno);
         fail(buffer);
     }
 }
@@ -519,14 +531,15 @@
         "<a>\n"
         "  <b>\n"
         "  </a>";  /* missing </b> */
-    int colno;
+    XML_Size colno;
     if (XML_Parse(parser, text, strlen(text), XML_FALSE) != XML_STATUS_ERROR)
         fail("Expected a parse error");
 
     colno = XML_GetCurrentColumnNumber(parser);
     if (colno != 4) { 
         char buffer[100];
-        sprintf(buffer, "expected 4 columns, saw %d", colno);
+        sprintf(buffer, 
+            "expected 4 columns, saw %" XML_FMT_INT_MOD "u", colno);
         fail(buffer);
     }
 }


From kwaclaw at users.sourceforge.net  Wed Dec 28 07:07:56 2005
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Wed, 28 Dec 2005 07:07:56 +0100 (CET)
Subject: [Expat-checkins] expat/lib expat_external.h,1.5,1.6
Message-ID: <20051228060756.ADBAF1E4002@bag.python.org>

Update of /cvsroot/expat/expat/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32089

Modified Files:
	expat_external.h 
Log Message:
Added some whitespace.

Index: expat_external.h
===================================================================
RCS file: /cvsroot/expat/expat/lib/expat_external.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- expat_external.h	25 Dec 2005 16:52:13 -0000	1.5
+++ expat_external.h	28 Dec 2005 06:07:52 -0000	1.6
@@ -65,6 +65,7 @@
 #endif
 #endif  /* not defined XML_STATIC */
 
+
 /* If we didn't define it above, define it away: */
 #ifndef XMLIMPORT
 #define XMLIMPORT


From kwaclaw at users.sourceforge.net  Wed Dec 28 19:42:07 2005
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Wed, 28 Dec 2005 19:42:07 +0100 (CET)
Subject: [Expat-checkins] expat README,1.29,1.30
Message-ID: <20051228184207.1A83A1E4002@bag.python.org>

Update of /cvsroot/expat/expat
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2620

Modified Files:
	README 
Log Message:
Added some info about XML_LARGE_SIZE and make options.

Index: README
===================================================================
RCS file: /cvsroot/expat/expat/README,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- README	23 Dec 2005 16:57:53 -0000	1.29
+++ README	28 Dec 2005 18:41:57 -0000	1.30
@@ -48,14 +48,20 @@
 /home/me/mystuff/bin, you can tell configure about that with:
 
         ./configure --prefix=/home/me/mystuff
+        
+Another interesting option is to enable 64-bit integer support for
+line- and column numbers and the over-all byte index:
+
+        ./configure CPPFLAGS=-DXML_LARGE_SIZE
 
 After running the configure script, the "make" command will build
 things and "make install" will install things into their proper
-location.  Note that you need to have write permission into the
-directories into which things will be installed.
+location.  Have a look at the "Makefile" to learn about additional
+"make" options.  Note that you need to have write permission into
+the directories into which things will be installed.
 
 If you are interested in building Expat to provide document
-information in UTF-16 rather than the default UTF-8, following these
+information in UTF-16 rather than the default UTF-8, follow these
 instructions:
 
         1. For UTF-16 output as unsigned short (and version/error


From kwaclaw at users.sourceforge.net  Wed Dec 28 19:43:40 2005
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Wed, 28 Dec 2005 19:43:40 +0100 (CET)
Subject: [Expat-checkins] expat/examples elements.c, 1.6, 1.7 outline.c, 1.6,
	1.7
Message-ID: <20051228184340.E63951E4002@bag.python.org>

Update of /cvsroot/expat/expat/examples
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2963

Modified Files:
	elements.c outline.c 
Log Message:
* Added support for XML_LARGE_SIZE.
* Added comment about using with UTF-8 version of Expat only.

Index: elements.c
===================================================================
RCS file: /cvsroot/expat/expat/examples/elements.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- elements.c	24 Dec 2005 06:52:33 -0000	1.6
+++ elements.c	28 Dec 2005 18:43:36 -0000	1.7
@@ -2,11 +2,22 @@
    reads an XML document from standard input and writes a line with
    the name of each element to standard output indenting child
    elements by one tab stop more than their parent element.
+   It must be used with Expat compiled for UTF-8 output.
 */
 
 #include <stdio.h>
 #include "expat.h"
 
+#ifdef XML_LARGE_SIZE
+#if defined(XML_USE_MSC_EXTENSIONS) && _MSC_VER < 1400
+#define XML_FMT_INT_MOD "I64"
+#else
+#define XML_FMT_INT_MOD "ll"
+#endif
+#else
+#define XML_FMT_INT_MOD "l"
+#endif
+
 static void XMLCALL
 startElement(void *userData, const char *name, const char **atts)
 {
@@ -45,7 +56,7 @@
     done = len < sizeof(buf);
     if (XML_Parse(parser, buf, len, done) == XML_STATUS_ERROR) {
       fprintf(stderr,
-              "%s at line %d\n",
+              "%s at line %" XML_FMT_INT_MOD "u\n",
               XML_ErrorString(XML_GetErrorCode(parser)),
               XML_GetCurrentLineNumber(parser));
       return 1;

Index: outline.c
===================================================================
RCS file: /cvsroot/expat/expat/examples/outline.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- outline.c	24 Dec 2005 06:52:33 -0000	1.6
+++ outline.c	28 Dec 2005 18:43:36 -0000	1.7
@@ -18,12 +18,23 @@
  *
  * Read an XML document from standard input and print an element
  * outline on standard output.
+ * Must be used with Expat compiled for UTF-8 output.
  */
 
 
 #include <stdio.h>
 #include <expat.h>
 
+#ifdef XML_LARGE_SIZE
+#if defined(XML_USE_MSC_EXTENSIONS) && _MSC_VER < 1400
+#define XML_FMT_INT_MOD "I64"
+#else
+#define XML_FMT_INT_MOD "ll"
+#endif
+#else
+#define XML_FMT_INT_MOD "l"
+#endif
+
 #define BUFFSIZE        8192
 
 char Buff[BUFFSIZE];
@@ -83,7 +94,7 @@
     done = feof(stdin);
 
     if (XML_Parse(p, Buff, len, done) == XML_STATUS_ERROR) {
-      fprintf(stderr, "Parse error at line %d:\n%s\n",
+      fprintf(stderr, "Parse error at line %" XML_FMT_INT_MOD "u:\n%s\n",
               XML_GetCurrentLineNumber(p),
               XML_ErrorString(XML_GetErrorCode(p)));
       exit(-1);


From ssolie at users.sourceforge.net  Thu Dec 29 04:01:08 2005
From: ssolie at users.sourceforge.net (Steven Solie)
Date: Thu, 29 Dec 2005 04:01:08 +0100 (CET)
Subject: [Expat-checkins] expat MANIFEST,1.28,1.29
Message-ID: <20051229030108.837C31E4002@bag.python.org>

Update of /cvsroot/expat/expat
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3951

Modified Files:
	MANIFEST 
Log Message:
added amigaconfig.h

Index: MANIFEST
===================================================================
RCS file: /cvsroot/expat/expat/MANIFEST,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- MANIFEST	27 Dec 2005 16:20:26 -0000	1.28
+++ MANIFEST	29 Dec 2005 03:01:04 -0000	1.29
@@ -66,6 +66,7 @@
 examples/outline.c
 examples/outline.dsp
 lib/Makefile.MPW
+lib/amigaconfig.h
 lib/ascii.h
 lib/asciitab.h
 lib/expat.dsp


From kwaclaw at users.sourceforge.net  Thu Dec 29 06:13:10 2005
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Thu, 29 Dec 2005 06:13:10 +0100 (CET)
Subject: [Expat-checkins] expat COPYING,1.3,1.4
Message-ID: <20051229051310.420DC1E4002@bag.python.org>

Update of /cvsroot/expat/expat
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23537

Modified Files:
	COPYING 
Log Message:
Updated copyright dates.

Index: COPYING
===================================================================
RCS file: /cvsroot/expat/expat/COPYING,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- COPYING	30 Oct 2003 19:59:50 -0000	1.3
+++ COPYING	29 Dec 2005 05:13:05 -0000	1.4
@@ -1,6 +1,6 @@
 Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
                                and Clark Cooper
-Copyright (c) 2001, 2002, 2003 Expat maintainers.
+Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Expat maintainers.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the


From ssolie at users.sourceforge.net  Fri Dec 30 05:18:17 2005
From: ssolie at users.sourceforge.net (Steven Solie)
Date: Fri, 30 Dec 2005 05:18:17 +0100 (CET)
Subject: [Expat-checkins] expat/amiga Makefile,1.3,1.4
Message-ID: <20051230041817.9DFE61E4002@bag.python.org>

Update of /cvsroot/expat/expat/amiga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8200

Modified Files:
	Makefile 
Log Message:
added missing include path

Index: Makefile
===================================================================
RCS file: /cvsroot/expat/expat/amiga/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile	27 Dec 2005 15:47:31 -0000	1.3
+++ Makefile	30 Dec 2005 04:18:13 -0000	1.4
@@ -88,7 +88,7 @@
 
 ifeq ($(MAKECMDGOALS), sharedlib)
  CFLAGS += -DAMIGA_SHARED_LIB -D__USE_INLINE__
- INCLUDES = -I. -Iinclude -Iinclude/libraries
+ INCLUDES = -I. -Iinclude -Iinclude/libraries -I../lib
  LAUNCH = $(DESTDIR)/launch.o
 endif
 


From ssolie at users.sourceforge.net  Fri Dec 30 05:19:09 2005
From: ssolie at users.sourceforge.net (Steven Solie)
Date: Fri, 30 Dec 2005 05:19:09 +0100 (CET)
Subject: [Expat-checkins] expat/amiga/include/libraries expat.h,1.1,1.2
Message-ID: <20051230041909.6256D1E4002@bag.python.org>

Update of /cvsroot/expat/expat/amiga/include/libraries
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8317

Modified Files:
	expat.h 
Log Message:
Added 2.0 definitions and bumped version

Index: expat.h
===================================================================
RCS file: /cvsroot/expat/expat/amiga/include/libraries/expat.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- expat.h	24 Dec 2005 06:45:36 -0000	1.1
+++ expat.h	30 Dec 2005 04:19:05 -0000	1.2
@@ -50,6 +50,8 @@
 
 typedef char XML_Char;
 typedef char XML_LChar;
+typedef long XML_Index;
+typedef unsigned long XML_Size;
 
 struct XML_ParserStruct;
 typedef struct XML_ParserStruct *XML_Parser;
@@ -105,7 +107,10 @@
   XML_ERROR_NOT_SUSPENDED,
   XML_ERROR_ABORTED,
   XML_ERROR_FINISHED,
-  XML_ERROR_SUSPEND_PE
+  XML_ERROR_SUSPEND_PE,
+  XML_ERROR_RESERVED_PREFIX_XML,
+  XML_ERROR_RESERVED_PREFIX_XMLNS,
+  XML_ERROR_RESERVED_NAMESPACE_URI
 };
 
 enum XML_Content_Type {
@@ -535,9 +540,9 @@
 XML_GetFeatureList(void);
 
 
-#define XML_MAJOR_VERSION 1
-#define XML_MINOR_VERSION 95
-#define XML_MICRO_VERSION 8
+#define XML_MAJOR_VERSION 2
+#define XML_MINOR_VERSION 0
+#define XML_MICRO_VERSION 0
 
 
 /****************************************************************************/