From kwaclaw at users.sourceforge.net  Sun Jan 18 22:26:15 2009
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Sun, 18 Jan 2009 21:26:15 +0000
Subject: [Expat-checkins] expat/conftools expat.m4,1.1,1.2
Message-ID: <E1LOf9r-0003tE-Bd@23jxhf1.ch3.sourceforge.com>

Update of /cvsroot/expat/expat/conftools
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv14952

Modified Files:
	expat.m4 
Log Message:
Applied patch originating from Debian (http://svn.debian.org/wsvn/debian-xml-sgml/packages/expat/trunk/debian/patches/485129_fix_underquotation_in_m4.dpatch?op=file&rev=0&sc=0).

Index: expat.m4
===================================================================
RCS file: /cvsroot/expat/expat/conftools/expat.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- expat.m4	9 Nov 2001 04:55:33 -0000	1.1
+++ expat.m4	18 Jan 2009 21:26:13 -0000	1.2
@@ -7,7 +7,7 @@
 dnl In addition, an Automake conditional EXPAT_INSTALLED is set accordingly.
 dnl This is necessary to adapt a whole lot of packages that have expat
 dnl bundled as a static library.
-AC_DEFUN(AM_WITH_EXPAT,
+AC_DEFUN([AM_WITH_EXPAT],
 [ AC_ARG_WITH(expat,
 	      [  --with-expat=PREFIX     Use system Expat library],
 	      , with_expat=no)


From kwaclaw at users.sourceforge.net  Sun Jan 18 22:55:12 2009
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Sun, 18 Jan 2009 21:55:12 +0000
Subject: [Expat-checkins] expat/doc xmlwf.sgml,1.4,1.5
Message-ID: <E1LOfbs-00046r-U3@23jxhf1.ch3.sourceforge.com>

Update of /cvsroot/expat/expat/doc
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv15797

Modified Files:
	xmlwf.sgml 
Log Message:
Fix for issue #2517946.

Index: xmlwf.sgml
===================================================================
RCS file: /cvsroot/expat/expat/doc/xmlwf.sgml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- xmlwf.sgml	24 Jan 2003 18:34:03 -0000	1.4
+++ xmlwf.sgml	18 Jan 2009 21:55:10 -0000	1.5
@@ -389,11 +389,6 @@
   <refsect1>
     <title>BUGS</title>
 	<para>
-	According to the W3C standard, an XML file without a
-	declaration at the beginning is not considered well-formed.
-	However, <command>&dhpackage;</command> allows this to pass.
-	</para>
-	<para>
 	<command>&dhpackage;</command> returns a 0 - noerr result,
 	even if the file is not well-formed.  There is no good way for
 	a program to use <command>&dhpackage;</command> to quickly


From kwaclaw at users.sourceforge.net  Sun Jan 18 23:58:34 2009
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Sun, 18 Jan 2009 22:58:34 +0000
Subject: [Expat-checkins] expat/conftools config.sub, 1.4, 1.5 config.guess,
	1.4, 1.5
Message-ID: <E1LOgbC-0004s7-BG@23jxhf1.ch3.sourceforge.com>

Update of /cvsroot/expat/expat/conftools
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv18719

Modified Files:
	config.sub config.guess 
Log Message:
As per issue #1983953: updates to the most recent versions available
at the repository http://git.savannah.gnu.org.

Index: config.sub
===================================================================
RCS file: /cvsroot/expat/expat/conftools/config.sub,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- config.sub	22 Sep 2006 14:42:54 -0000	1.4
+++ config.sub	18 Jan 2009 22:58:32 -0000	1.5
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-#   Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   Free Software Foundation, Inc.
 
-timestamp='2006-09-20'
+timestamp='2008-12-11'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -72,8 +72,8 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -245,17 +245,20 @@
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| fr30 | frv \
+	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
+	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore \
+	| maxq | mb | microblaze | mcore | mep | metag \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
+	| mips64octeon | mips64octeonel \
 	| mips64orion | mips64orionel \
+	| mips64r5900 | mips64r5900el \
+	| mips64vr | mips64vrel \
 	| mips64vr4100 | mips64vr4100el \
 	| mips64vr4300 | mips64vr4300el \
 	| mips64vr5000 | mips64vr5000el \
@@ -277,7 +280,7 @@
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
 	| score \
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
@@ -286,7 +289,7 @@
 	| v850 | v850e \
 	| we32k \
 	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-	| z8k)
+	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
@@ -324,19 +327,22 @@
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
+	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
-	| mips64vr-* | mips64vrel-* \
+	| mips64octeon-* | mips64octeonel-* \
 	| mips64orion-* | mips64orionel-* \
+	| mips64r5900-* | mips64r5900el-* \
+	| mips64vr-* | mips64vrel-* \
 	| mips64vr4100-* | mips64vr4100el-* \
 	| mips64vr4300-* | mips64vr4300el-* \
 	| mips64vr5000-* | mips64vr5000el-* \
@@ -358,20 +364,24 @@
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
 	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
 	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa-* \
+	| xstormy16-* | xtensa*-* \
 	| ymp-* \
-	| z8k-*)
+	| z8k-* | z80-*)
+		;;
+	# Recognize the basic CPU types without company name, with glob match.
+	xtensa*)
+		basic_machine=$basic_machine-unknown
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
@@ -443,10 +453,22 @@
 		basic_machine=ns32k-sequent
 		os=-dynix
 		;;
+	blackfin)
+		basic_machine=bfin-unknown
+		os=-linux
+		;;
+	blackfin-*)
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
 		;;
+        cegcc)
+		basic_machine=arm-unknown
+		os=-cegcc
+		;;
 	convex-c1)
 		basic_machine=c1-convex
 		os=-bsd
@@ -475,8 +497,8 @@
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16c)
-		basic_machine=cr16c-unknown
+	cr16)
+		basic_machine=cr16-unknown
 		os=-elf
 		;;
 	crds | unos)
@@ -514,6 +536,10 @@
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
+	dicos)
+		basic_machine=i686-pc
+		os=-dicos
+		;;
 	djgpp)
 		basic_machine=i586-pc
 		os=-msdosdjgpp
@@ -668,6 +694,14 @@
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
+	m68knommu)
+		basic_machine=m68k-unknown
+		os=-linux
+		;;
+	m68knommu-*)
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	m88k-omron*)
 		basic_machine=m88k-omron
 		;;
@@ -683,6 +717,10 @@
 		basic_machine=i386-pc
 		os=-mingw32
 		;;
+	mingw32ce)
+		basic_machine=arm-unknown
+		os=-mingw32ce
+		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
@@ -809,6 +847,14 @@
 		basic_machine=i860-intel
 		os=-osf
 		;;
+	parisc)
+		basic_machine=hppa-unknown
+		os=-linux
+		;;
+	parisc-*)
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	pbd)
 		basic_machine=sparc-tti
 		;;
@@ -925,6 +971,9 @@
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
+	sh5el)
+		basic_machine=sh5le-unknown
+		;;
 	sh64)
 		basic_machine=sh64-unknown
 		;;
@@ -1014,6 +1063,10 @@
 		basic_machine=tic6x-unknown
 		os=-coff
 		;;
+	tile*)
+		basic_machine=tile-unknown
+		os=-linux-gnu
+		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
@@ -1089,6 +1142,10 @@
 		basic_machine=z8k-unknown
 		os=-sim
 		;;
+	z80-*-coff)
+		basic_machine=z80-unknown
+		os=-sim
+		;;
 	none)
 		basic_machine=none-none
 		os=-none
@@ -1127,7 +1184,7 @@
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
 	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
@@ -1209,7 +1266,7 @@
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
+	      | -chorusos* | -chorusrdb* | -cegcc* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
@@ -1219,7 +1276,7 @@
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1349,6 +1406,9 @@
 	-zvmoe)
 		os=-zvmoe
 		;;
+	-dicos*)
+		os=-dicos
+		;;
 	-none)
 		;;
 	*)
@@ -1414,6 +1474,9 @@
 	m68*-cisco)
 		os=-aout
 		;;
+        mep-*)
+		os=-elf
+		;;
 	mips*-cisco)
 		os=-elf
 		;;

Index: config.guess
===================================================================
RCS file: /cvsroot/expat/expat/conftools/config.guess,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- config.guess	22 Sep 2006 14:42:54 -0000	1.4
+++ config.guess	18 Jan 2009 22:58:32 -0000	1.5
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-#   Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   Free Software Foundation, Inc.
 
-timestamp='2006-07-02'
+timestamp='2008-12-19'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -56,8 +56,8 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -161,6 +161,7 @@
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
 	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
@@ -329,8 +330,21 @@
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
-    i86pc:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+	eval $set_cc_for_build
+	SUN_ARCH="i386"
+	# If there is a compiler, see if it is configured for 64-bit objects.
+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+	# This test works for both compilers.
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		SUN_ARCH="x86_64"
+	    fi
+	fi
+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
@@ -531,7 +545,7 @@
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[45])
+    *:AIX:*:[456])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -780,7 +794,7 @@
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
-    i*:MINGW*:*)
+    *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
     i*:windows32*:*)
@@ -790,12 +804,18 @@
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    x86:Interix*:[3456]*)
-	echo i586-pc-interix${UNAME_RELEASE}
-	exit ;;
-    EM64T:Interix*:[3456]*)
-	echo x86_64-unknown-interix${UNAME_RELEASE}
-	exit ;;
+    *:Interix*:[3456]*)
+    	case ${UNAME_MACHINE} in
+	    x86)
+		echo i586-pc-interix${UNAME_RELEASE}
+		exit ;;
+	    EM64T | authenticamd | genuineintel)
+		echo x86_64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	    IA64)
+		echo ia64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	esac ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
@@ -829,7 +849,14 @@
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
     arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	eval $set_cc_for_build
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_EABI__
+	then
+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+	else
+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	fi
 	exit ;;
     avr32*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -921,6 +948,9 @@
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
 	exit ;;
+    padre:Linux:*:*)
+	echo sparc-unknown-linux-gnu
+	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -950,6 +980,9 @@
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
 	exit ;;
+    xtensa*:Linux:*:*)
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
@@ -968,9 +1001,6 @@
 	  a.out-i386-linux)
 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
 		exit ;;
-	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit ;;
 	  "")
 		# Either a pre-BFD a.out linker (linux-gnuoldld) or
 		# one that does not give us useful --help.
@@ -1124,6 +1154,16 @@
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
           && { echo i486-ncr-sysv4; exit; } ;;
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+	OS_REL='.3'
+	test -r /etc/.relid \
+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
@@ -1199,6 +1239,9 @@
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
 	exit ;;
+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+	echo i586-pc-haiku
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit ;;
@@ -1208,6 +1251,15 @@
     SX-6:SUPER-UX:*:*)
 	echo sx6-nec-superux${UNAME_RELEASE}
 	exit ;;
+    SX-7:SUPER-UX:*:*)
+	echo sx7-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8R:SUPER-UX:*:*)
+	echo sx8r-nec-superux${UNAME_RELEASE}
+	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit ;;
@@ -1458,9 +1510,9 @@
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
 
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 and
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be


From kwaclaw at users.sourceforge.net  Mon Jan 19 01:19:49 2009
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Mon, 19 Jan 2009 00:19:49 +0000
Subject: [Expat-checkins] expat/xmlwf xmlwf.c,1.74,1.75
Message-ID: <E1LOhrp-0005p8-Uq@23jxhf1.ch3.sourceforge.com>

Update of /cvsroot/expat/expat/xmlwf
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv22386

Modified Files:
	xmlwf.c 
Log Message:
Fix for issue #2517938: xmlwf should return a non-zero code for parsing errors.

Index: xmlwf.c
===================================================================
RCS file: /cvsroot/expat/expat/xmlwf/xmlwf.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- xmlwf.c	3 Jun 2007 15:00:09 -0000	1.74
+++ xmlwf.c	19 Jan 2009 00:19:47 -0000	1.75
@@ -849,8 +849,10 @@
       if (outputType == 'm')
         metaEndDocument(parser);
       fclose(fp);
-      if (!result)
+      if (!result) {
         tremove(outName);
+        exit(2);
+      }
       free(outName);
     }
     XML_ParserFree(parser);


From kwaclaw at users.sourceforge.net  Mon Jan 19 04:35:08 2009
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Mon, 19 Jan 2009 03:35:08 +0000
Subject: [Expat-checkins] expat expat.pc.in,1.1,1.2
Message-ID: <E1LOkuq-0007cA-VP@23jxhf1.ch3.sourceforge.com>

Update of /cvsroot/expat/expat
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv29270

Modified Files:
	expat.pc.in 
Log Message:
Added URL for Expat project site.

Index: expat.pc.in
===================================================================
RCS file: /cvsroot/expat/expat/expat.pc.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- expat.pc.in	3 Sep 2007 17:26:20 -0000	1.1
+++ expat.pc.in	19 Jan 2009 03:35:06 -0000	1.2
@@ -6,5 +6,6 @@
 Name: expat
 Version: @PACKAGE_VERSION@
 Description: expat XML parser
+URL: http://www.libexpat.org
 Libs: -L${libdir} -lexpat
 Cflags: -I${includedir}


From kwaclaw at users.sourceforge.net  Mon Jan 19 19:37:09 2009
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Mon, 19 Jan 2009 18:37:09 +0000
Subject: [Expat-checkins] expat/xmlwf xmlwf.dsp,1.12,1.13
Message-ID: <E1LOyzl-0004Ow-2o@23jxhf1.ch3.sourceforge.com>

Update of /cvsroot/expat/expat/xmlwf
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv16899/xmlwf

Modified Files:
	xmlwf.dsp 
Log Message:
Removed unnecessary linker dependencies.

Index: xmlwf.dsp
===================================================================
RCS file: /cvsroot/expat/expat/xmlwf/xmlwf.dsp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- xmlwf.dsp	3 May 2007 02:23:17 -0000	1.12
+++ xmlwf.dsp	19 Jan 2009 18:37:07 -0000	1.13
@@ -50,8 +50,8 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 setargv.obj kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /machine:I386
+# ADD BASE LINK32 /nologo /subsystem:console /machine:I386
+# ADD LINK32 setargv.obj /nologo /subsystem:console /pdb:none /machine:I386
 # SUBTRACT LINK32 /nodefaultlib
 
 !ELSEIF  "$(CFG)" == "xmlwf - Win32 Debug"
@@ -76,8 +76,8 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
-# ADD LINK32 setargv.obj kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386
+# ADD BASE LINK32 /nologo /subsystem:console /debug /machine:I386
+# ADD LINK32 setargv.obj /nologo /subsystem:console /pdb:none /debug /machine:I386
 
 !ENDIF 
 


From kwaclaw at users.sourceforge.net  Mon Jan 19 19:37:09 2009
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Mon, 19 Jan 2009 18:37:09 +0000
Subject: [Expat-checkins] expat/lib expat.dsp,1.15,1.16 expatw.dsp,1.8,1.9
Message-ID: <E1LOyzl-0004Oq-1r@23jxhf1.ch3.sourceforge.com>

Update of /cvsroot/expat/expat/lib
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv16899/lib

Modified Files:
	expat.dsp expatw.dsp 
Log Message:
Removed unnecessary linker dependencies.

Index: expat.dsp
===================================================================
RCS file: /cvsroot/expat/expat/lib/expat.dsp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- expat.dsp	3 May 2007 02:13:28 -0000	1.15
+++ expat.dsp	19 Jan 2009 18:37:06 -0000	1.16
@@ -53,8 +53,8 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"..\win32\bin\Release/libexpat.dll"
+# ADD BASE LINK32 /nologo /dll /machine:I386
+# ADD LINK32 /nologo /dll /pdb:none /machine:I386 /out:"..\win32\bin\Release/libexpat.dll"
 
 !ELSEIF  "$(CFG)" == "expat - Win32 Debug"
 
@@ -79,8 +79,8 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /debug /machine:I386 /out:"..\win32\bin\Debug/libexpat.dll"
+# ADD BASE LINK32 /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 /nologo /dll /pdb:none /debug /machine:I386 /out:"..\win32\bin\Debug/libexpat.dll"
 
 !ENDIF 
 

Index: expatw.dsp
===================================================================
RCS file: /cvsroot/expat/expat/lib/expatw.dsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- expatw.dsp	3 May 2007 02:13:28 -0000	1.8
+++ expatw.dsp	19 Jan 2009 18:37:06 -0000	1.9
@@ -53,8 +53,8 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"..\win32\bin\Release/libexpatw.dll"
+# ADD BASE LINK32 /nologo /dll /machine:I386
+# ADD LINK32 /nologo /dll /pdb:none /machine:I386 /out:"..\win32\bin\Release/libexpatw.dll"
 
 !ELSEIF  "$(CFG)" == "expatw - Win32 Debug"
 
@@ -79,8 +79,8 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /debug /machine:I386 /out:"..\win32\bin\Debug/libexpatw.dll"
+# ADD BASE LINK32 /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 /nologo /dll /pdb:none /debug /machine:I386 /out:"..\win32\bin\Debug/libexpatw.dll"
 
 !ENDIF 
 


From kwaclaw at users.sourceforge.net  Mon Jan 19 19:37:09 2009
From: kwaclaw at users.sourceforge.net (Karl Waclawek)
Date: Mon, 19 Jan 2009 18:37:09 +0000
Subject: [Expat-checkins] expat/examples elements.dsp, 1.7, 1.8 outline.dsp,
	1.5, 1.6
Message-ID: <E1LOyzl-0004On-0a@23jxhf1.ch3.sourceforge.com>

Update of /cvsroot/expat/expat/examples
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv16899/examples

Modified Files:
	elements.dsp outline.dsp 
Log Message:
Removed unnecessary linker dependencies.

Index: elements.dsp
===================================================================
RCS file: /cvsroot/expat/expat/examples/elements.dsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- elements.dsp	3 May 2007 02:22:44 -0000	1.7
+++ elements.dsp	19 Jan 2009 18:37:06 -0000	1.8
@@ -50,8 +50,8 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 odbccp32.lib libexpatMT.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib /nologo /subsystem:console /pdb:none /machine:I386 /libpath:"..\win32\bin\Release"
+# ADD BASE LINK32 /nologo /subsystem:console /machine:I386
+# ADD LINK32 libexpatMT.lib /nologo /subsystem:console /pdb:none /machine:I386 /libpath:"..\win32\bin\Release"
 
 !ELSEIF  "$(CFG)" == "elements - Win32 Debug"
 
@@ -74,8 +74,8 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 odbccp32.lib libexpatMT.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /libpath:"..\win32\bin\Debug"
+# ADD BASE LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 libexpatMT.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /libpath:"..\win32\bin\Debug"
 
 !ENDIF 
 

Index: outline.dsp
===================================================================
RCS file: /cvsroot/expat/expat/examples/outline.dsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- outline.dsp	3 May 2007 02:22:44 -0000	1.5
+++ outline.dsp	19 Jan 2009 18:37:06 -0000	1.6
@@ -50,8 +50,8 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /machine:I386
+# ADD BASE LINK32 /nologo /subsystem:console /machine:I386
+# ADD LINK32 /nologo /subsystem:console /pdb:none /machine:I386
 
 !ELSEIF  "$(CFG)" == "outline - Win32 Debug"
 
@@ -74,8 +74,8 @@
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386
+# ADD BASE LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 /nologo /subsystem:console /pdb:none /debug /machine:I386
 
 !ENDIF 
 


From ssolie at users.sourceforge.net  Sat Jan 31 06:40:58 2009
From: ssolie at users.sourceforge.net (Steven Solie)
Date: Sat, 31 Jan 2009 05:40:58 +0000
Subject: [Expat-checkins] expat/amiga/clib2 - New directory
Message-ID: <E1LT8bC-00006M-Ba@23jxhf1.ch3.sourceforge.com>

Update of /cvsroot/expat/expat/amiga/clib2
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv385/clib2

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



From ssolie at users.sourceforge.net  Sat Jan 31 06:40:58 2009
From: ssolie at users.sourceforge.net (Steven Solie)
Date: Sat, 31 Jan 2009 05:40:58 +0000
Subject: [Expat-checkins] expat/amiga/newlib - New directory
Message-ID: <E1LT8bC-00006O-Cs@23jxhf1.ch3.sourceforge.com>

Update of /cvsroot/expat/expat/amiga/newlib
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv385/newlib

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



From ssolie at users.sourceforge.net  Sat Jan 31 06:40:58 2009
From: ssolie at users.sourceforge.net (Steven Solie)
Date: Sat, 31 Jan 2009 05:40:58 +0000
Subject: [Expat-checkins] expat/amiga/so - New directory
Message-ID: <E1LT8bC-00006Q-Du@23jxhf1.ch3.sourceforge.com>

Update of /cvsroot/expat/expat/amiga/so
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv385/so

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



From ssolie at users.sourceforge.net  Sat Jan 31 07:21:11 2009
From: ssolie at users.sourceforge.net (Steven Solie)
Date: Sat, 31 Jan 2009 06:21:11 +0000
Subject: [Expat-checkins] expat MANIFEST,1.29,1.30
Message-ID: <E1LT9E7-00010I-Jv@23jxhf1.ch3.sourceforge.com>

Update of /cvsroot/expat/expat
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3704

Modified Files:
	MANIFEST 
Log Message:
AmigaOS specific changes. See amiga/README.txt for more details.

Index: MANIFEST
===================================================================
RCS file: /cvsroot/expat/expat/MANIFEST,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- MANIFEST	29 Dec 2005 03:01:04 -0000	1.29
+++ MANIFEST	31 Jan 2009 06:21:09 -0000	1.30
@@ -1,5 +1,8 @@
 amiga/stdlib.c
 amiga/launch.c
+amiga/expat_68k.c
+amiga/expat_68k.h
+amiga/expat_68k_handler_stubs.c
 amiga/expat_vectors.c
 amiga/expat_lib.c
 amiga/expat.xml


From ssolie at users.sourceforge.net  Sat Jan 31 07:21:11 2009
From: ssolie at users.sourceforge.net (Steven Solie)
Date: Sat, 31 Jan 2009 06:21:11 +0000
Subject: [Expat-checkins] expat/lib xmlparse.c, 1.162, 1.163 xmlrole.c, 1.22,
	1.23 xmltok.c, 1.36, 1.37
Message-ID: <E1LT9E7-00010T-QW@23jxhf1.ch3.sourceforge.com>

Update of /cvsroot/expat/expat/lib
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3704/lib

Modified Files:
	xmlparse.c xmlrole.c xmltok.c 
Log Message:
AmigaOS specific changes. See amiga/README.txt for more details.

Index: xmlparse.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -d -r1.162 -r1.163
--- xmlparse.c	3 Sep 2007 16:34:40 -0000	1.162
+++ xmlparse.c	31 Jan 2009 06:21:09 -0000	1.163
@@ -12,7 +12,7 @@
 #include "winconfig.h"
 #elif defined(MACOS_CLASSIC)
 #include "macconfig.h"
-#elif defined(__amigaos4__)
+#elif defined(__amigaos__)
 #include "amigaconfig.h"
 #elif defined(__WATCOMC__)
 #include "watcomconfig.h"
@@ -327,15 +327,15 @@
 static enum XML_Error
 initializeEncoding(XML_Parser parser);
 static enum XML_Error
-doProlog(XML_Parser parser, const ENCODING *enc, const char *s, 
-         const char *end, int tok, const char *next, const char **nextPtr, 
+doProlog(XML_Parser parser, const ENCODING *enc, const char *s,
+         const char *end, int tok, const char *next, const char **nextPtr,
          XML_Bool haveMore);
 static enum XML_Error
-processInternalEntity(XML_Parser parser, ENTITY *entity, 
+processInternalEntity(XML_Parser parser, ENTITY *entity,
                       XML_Bool betweenDecl);
 static enum XML_Error
 doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
-          const char *start, const char *end, const char **endPtr, 
+          const char *start, const char *end, const char **endPtr,
           XML_Bool haveMore);
 static enum XML_Error
 doCdataSection(XML_Parser parser, const ENCODING *, const char **startPtr,
@@ -353,7 +353,7 @@
 addBinding(XML_Parser parser, PREFIX *prefix, const ATTRIBUTE_ID *attId,
            const XML_Char *uri, BINDING **bindingsPtr);
 static int
-defineAttribute(ELEMENT_TYPE *type, ATTRIBUTE_ID *, XML_Bool isCdata, 
+defineAttribute(ELEMENT_TYPE *type, ATTRIBUTE_ID *, XML_Bool isCdata,
                 XML_Bool isId, const XML_Char *dfltValue, XML_Parser parser);
 static enum XML_Error
 storeAttributeValue(XML_Parser parser, const ENCODING *, XML_Bool isCdata,
@@ -670,7 +670,7 @@
 
 static const XML_Char implicitContext[] = {
   ASCII_x, ASCII_m, ASCII_l, ASCII_EQUALS, ASCII_h, ASCII_t, ASCII_t, ASCII_p,
-  ASCII_COLON, ASCII_SLASH, ASCII_SLASH, ASCII_w, ASCII_w, ASCII_w, 
+  ASCII_COLON, ASCII_SLASH, ASCII_SLASH, ASCII_w, ASCII_w, ASCII_w,
   ASCII_PERIOD, ASCII_w, ASCII_3, ASCII_PERIOD, ASCII_o, ASCII_r, ASCII_g,
   ASCII_SLASH, ASCII_X, ASCII_M, ASCII_L, ASCII_SLASH, ASCII_1, ASCII_9,
   ASCII_9, ASCII_8, ASCII_SLASH, ASCII_n, ASCII_a, ASCII_m, ASCII_e,
@@ -1459,7 +1459,7 @@
         XmlUpdatePosition(encoding, positionPtr, bufferPtr, &position);
         positionPtr = bufferPtr;
         return XML_STATUS_SUSPENDED;
-      case XML_INITIALIZED: 
+      case XML_INITIALIZED:
       case XML_PARSING:
         ps_parsing = XML_FINISHED;
         /* fall through */
@@ -1582,7 +1582,7 @@
     case XML_SUSPENDED:
       result = XML_STATUS_SUSPENDED;
       break;
-    case XML_INITIALIZED: 
+    case XML_INITIALIZED:
     case XML_PARSING:
       if (isFinal) {
         ps_parsing = XML_FINISHED;
@@ -1729,7 +1729,7 @@
     case XML_SUSPENDED:
       result = XML_STATUS_SUSPENDED;
       break;
-    case XML_INITIALIZED: 
+    case XML_INITIALIZED:
     case XML_PARSING:
       if (ps_finalBuffer) {
         ps_parsing = XML_FINISHED;
@@ -1956,7 +1956,7 @@
 #endif
 #ifdef XML_LARGE_SIZE
     {XML_FEATURE_LARGE_SIZE,       XML_L("XML_LARGE_SIZE"), 0},
-#endif    
+#endif
     {XML_FEATURE_END,              NULL, 0}
   };
 
@@ -2019,7 +2019,7 @@
                  const char *end,
                  const char **endPtr)
 {
-  enum XML_Error result = doContent(parser, 0, encoding, start, end, 
+  enum XML_Error result = doContent(parser, 0, encoding, start, end,
                                     endPtr, (XML_Bool)!ps_finalBuffer);
   if (result == XML_ERROR_NONE) {
     if (!storeRawNames(parser))
@@ -2101,7 +2101,7 @@
       if (result != XML_ERROR_NONE)
         return result;
       switch (ps_parsing) {
-      case XML_SUSPENDED: 
+      case XML_SUSPENDED:
         *endPtr = next;
         return XML_ERROR_NONE;
       case XML_FINISHED:
@@ -2135,7 +2135,7 @@
                                const char *end,
                                const char **endPtr)
 {
-  enum XML_Error result = doContent(parser, 1, encoding, start, end, 
+  enum XML_Error result = doContent(parser, 1, encoding, start, end,
                                     endPtr, (XML_Bool)!ps_finalBuffer);
   if (result == XML_ERROR_NONE) {
     if (!storeRawNames(parser))
@@ -2154,7 +2154,7 @@
           XML_Bool haveMore)
 {
   /* save one level of indirection */
-  DTD * const dtd = _dtd;  
+  DTD * const dtd = _dtd;
 
   const char **eventPP;
   const char **eventEndPP;
@@ -2185,8 +2185,8 @@
       }
       else if (defaultHandler)
         reportDefault(parser, enc, s, end);
-      /* We are at the end of the final buffer, should we check for 
-         XML_SUSPENDED, XML_FINISHED? 
+      /* We are at the end of the final buffer, should we check for
+         XML_SUSPENDED, XML_FINISHED?
       */
       if (startTagLevel == 0)
         return XML_ERROR_NO_ELEMENTS;
@@ -2537,8 +2537,8 @@
       }
       else if (defaultHandler)
         reportDefault(parser, enc, s, end);
-      /* We are at the end of the final buffer, should we check for 
-         XML_SUSPENDED, XML_FINISHED? 
+      /* We are at the end of the final buffer, should we check for
+         XML_SUSPENDED, XML_FINISHED?
       */
       if (startTagLevel == 0) {
         *eventPP = end;
@@ -2550,7 +2550,7 @@
       }
       *nextPtr = end;
       return XML_ERROR_NONE;
-    case XML_TOK_DATA_CHARS: 
+    case XML_TOK_DATA_CHARS:
       {
         XML_CharacterDataHandler charDataHandler = characterDataHandler;
         if (charDataHandler) {
@@ -2590,7 +2590,7 @@
     }
     *eventPP = s = next;
     switch (ps_parsing) {
-    case XML_SUSPENDED: 
+    case XML_SUSPENDED:
       *nextPtr = next;
       return XML_ERROR_NONE;
     case XML_FINISHED:
@@ -2949,27 +2949,27 @@
   static const XML_Char xmlNamespace[] = {
     ASCII_h, ASCII_t, ASCII_t, ASCII_p, ASCII_COLON, ASCII_SLASH, ASCII_SLASH,
     ASCII_w, ASCII_w, ASCII_w, ASCII_PERIOD, ASCII_w, ASCII_3, ASCII_PERIOD,
-    ASCII_o, ASCII_r, ASCII_g, ASCII_SLASH, ASCII_X, ASCII_M, ASCII_L, 
+    ASCII_o, ASCII_r, ASCII_g, ASCII_SLASH, ASCII_X, ASCII_M, ASCII_L,
     ASCII_SLASH, ASCII_1, ASCII_9, ASCII_9, ASCII_8, ASCII_SLASH,
     ASCII_n, ASCII_a, ASCII_m, ASCII_e, ASCII_s, ASCII_p, ASCII_a, ASCII_c,
     ASCII_e, '\0'
   };
-  static const int xmlLen = 
+  static const int xmlLen =
     (int)sizeof(xmlNamespace)/sizeof(XML_Char) - 1;
   static const XML_Char xmlnsNamespace[] = {
     ASCII_h, ASCII_t, ASCII_t, ASCII_p, ASCII_COLON, ASCII_SLASH, ASCII_SLASH,
     ASCII_w, ASCII_w, ASCII_w, ASCII_PERIOD, ASCII_w, ASCII_3, ASCII_PERIOD,
-    ASCII_o, ASCII_r, ASCII_g, ASCII_SLASH, ASCII_2, ASCII_0, ASCII_0, 
-    ASCII_0, ASCII_SLASH, ASCII_x, ASCII_m, ASCII_l, ASCII_n, ASCII_s, 
+    ASCII_o, ASCII_r, ASCII_g, ASCII_SLASH, ASCII_2, ASCII_0, ASCII_0,
+    ASCII_0, ASCII_SLASH, ASCII_x, ASCII_m, ASCII_l, ASCII_n, ASCII_s,
     ASCII_SLASH, '\0'
   };
-  static const int xmlnsLen = 
+  static const int xmlnsLen =
     (int)sizeof(xmlnsNamespace)/sizeof(XML_Char) - 1;
 
   XML_Bool mustBeXML = XML_FALSE;
   XML_Bool isXML = XML_TRUE;
   XML_Bool isXMLNS = XML_TRUE;
-  
+
   BINDING *b;
   int len;
 
@@ -2996,7 +2996,7 @@
     if (isXML && (len > xmlLen || uri[len] != xmlNamespace[len]))
       isXML = XML_FALSE;
 
-    if (!mustBeXML && isXMLNS 
+    if (!mustBeXML && isXMLNS
         && (len > xmlnsLen || uri[len] != xmlnsNamespace[len]))
       isXMLNS = XML_FALSE;
   }
@@ -3207,7 +3207,7 @@
                        const char *end,
                        const char **endPtr)
 {
-  enum XML_Error result = doIgnoreSection(parser, encoding, &start, end, 
+  enum XML_Error result = doIgnoreSection(parser, encoding, &start, end,
                                           endPtr, (XML_Bool)!ps_finalBuffer);
   if (result != XML_ERROR_NONE)
     return result;
@@ -3489,7 +3489,7 @@
   const char *next = start;
   eventPtr = start;
 
-  for (;;) {  
+  for (;;) {
     tok = XmlPrologTok(encoding, start, end, &next);
     eventEndPtr = next;
     if (tok <= 0) {
@@ -3517,7 +3517,7 @@
       if (result != XML_ERROR_NONE)
         return result;
       switch (ps_parsing) {
-      case XML_SUSPENDED: 
+      case XML_SUSPENDED:
         *nextPtr = next;
         return XML_ERROR_NONE;
       case XML_FINISHED:
@@ -3582,7 +3582,7 @@
   }
 
   processor = prologProcessor;
-  return doProlog(parser, encoding, s, end, tok, next, 
+  return doProlog(parser, encoding, s, end, tok, next,
                   nextPtr, (XML_Bool)!ps_finalBuffer);
 }
 
@@ -3632,7 +3632,7 @@
 {
   const char *next = s;
   int tok = XmlPrologTok(encoding, s, end, &next);
-  return doProlog(parser, encoding, s, end, tok, next, 
+  return doProlog(parser, encoding, s, end, tok, next,
                   nextPtr, (XML_Bool)!ps_finalBuffer);
 }
 
@@ -3649,7 +3649,7 @@
 #ifdef XML_DTD
   static const XML_Char externalSubsetName[] = { ASCII_HASH , '\0' };
 #endif /* XML_DTD */
-  static const XML_Char atypeCDATA[] = 
+  static const XML_Char atypeCDATA[] =
       { ASCII_C, ASCII_D, ASCII_A, ASCII_T, ASCII_A, '\0' };
   static const XML_Char atypeID[] = { ASCII_I, ASCII_D, '\0' };
   static const XML_Char atypeIDREF[] =
@@ -3670,7 +3670,7 @@
   static const XML_Char enumValueStart[] = { ASCII_LPAREN, '\0' };
 
   /* save one level of indirection */
-  DTD * const dtd = _dtd; 
+  DTD * const dtd = _dtd;
 
   const char **eventPP;
   const char **eventEndPP;
@@ -3846,8 +3846,8 @@
                                         entity->publicId))
             return XML_ERROR_EXTERNAL_ENTITY_HANDLING;
           if (dtd->paramEntityRead) {
-            if (!dtd->standalone && 
-                notStandaloneHandler && 
+            if (!dtd->standalone &&
+                notStandaloneHandler &&
                 !notStandaloneHandler(handlerArg))
               return XML_ERROR_NOT_STANDALONE;
           }
@@ -4285,7 +4285,7 @@
       switch (tok) {
       case XML_TOK_PARAM_ENTITY_REF:
         /* PE references in internal subset are
-           not allowed within declarations. */  
+           not allowed within declarations. */
         return XML_ERROR_PARAM_ENTITY_REF;
       case XML_TOK_XML_DECL:
         return XML_ERROR_MISPLACED_XML_PI;
@@ -4406,7 +4406,7 @@
           return XML_ERROR_RECURSIVE_ENTITY_REF;
         if (entity->textPtr) {
           enum XML_Error result;
-          XML_Bool betweenDecl = 
+          XML_Bool betweenDecl =
             (role == XML_ROLE_PARAM_ENTITY_REF ? XML_TRUE : XML_FALSE);
           result = processInternalEntity(parser, entity, betweenDecl);
           if (result != XML_ERROR_NONE)
@@ -4601,7 +4601,7 @@
       reportDefault(parser, enc, s, next);
 
     switch (ps_parsing) {
-    case XML_SUSPENDED: 
+    case XML_SUSPENDED:
       *nextPtr = next;
       return XML_ERROR_NONE;
     case XML_FINISHED:
@@ -4671,7 +4671,7 @@
     }
     eventPtr = s = next;
     switch (ps_parsing) {
-    case XML_SUSPENDED: 
+    case XML_SUSPENDED:
       *nextPtr = next;
       return XML_ERROR_NONE;
     case XML_FINISHED:
@@ -4714,12 +4714,12 @@
 #ifdef XML_DTD
   if (entity->is_param) {
     int tok = XmlPrologTok(internalEncoding, textStart, textEnd, &next);
-    result = doProlog(parser, internalEncoding, textStart, textEnd, tok, 
+    result = doProlog(parser, internalEncoding, textStart, textEnd, tok,
                       next, &next, XML_FALSE);
   }
-  else 
+  else
 #endif /* XML_DTD */
-    result = doContent(parser, tagLevel, internalEncoding, textStart, 
+    result = doContent(parser, tagLevel, internalEncoding, textStart,
                        textEnd, &next, XML_FALSE);
 
   if (result == XML_ERROR_NONE) {
@@ -4759,13 +4759,13 @@
 #ifdef XML_DTD
   if (entity->is_param) {
     int tok = XmlPrologTok(internalEncoding, textStart, textEnd, &next);
-    result = doProlog(parser, internalEncoding, textStart, textEnd, tok, 
+    result = doProlog(parser, internalEncoding, textStart, textEnd, tok,
                       next, &next, XML_FALSE);
   }
   else
 #endif /* XML_DTD */
-    result = doContent(parser, openEntity->startTagLevel, internalEncoding, 
-                       textStart, textEnd, &next, XML_FALSE);  
+    result = doContent(parser, openEntity->startTagLevel, internalEncoding,
+                       textStart, textEnd, &next, XML_FALSE);
 
   if (result != XML_ERROR_NONE)
     return result;
@@ -4786,7 +4786,7 @@
     int tok;
     processor = prologProcessor;
     tok = XmlPrologTok(encoding, s, end, &next);
-    return doProlog(parser, encoding, s, end, tok, next, nextPtr, 
+    return doProlog(parser, encoding, s, end, tok, next, nextPtr,
                     (XML_Bool)!ps_finalBuffer);
   }
   else
@@ -4795,8 +4795,8 @@
     processor = contentProcessor;
     /* see externalEntityContentProcessor vs contentProcessor */
     return doContent(parser, parentParser ? 1 : 0, encoding, s, end,
-                     nextPtr, (XML_Bool)!ps_finalBuffer); 
-  }  
+                     nextPtr, (XML_Bool)!ps_finalBuffer);
+  }
 }
 
 static enum XML_Error PTRCALL

Index: xmlrole.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlrole.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- xmlrole.c	5 Aug 2006 17:00:31 -0000	1.22
+++ xmlrole.c	31 Jan 2009 06:21:09 -0000	1.23
@@ -8,7 +8,7 @@
 #include "winconfig.h"
 #elif defined(MACOS_CLASSIC)
 #include "macconfig.h"
-#elif defined(__amigaos4__)
+#elif defined(__amigaos__)
 #include "amigaconfig.h"
 #elif defined(__WATCOMC__)
 #include "watcomconfig.h"

Index: xmltok.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmltok.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- xmltok.c	26 Nov 2006 17:34:46 -0000	1.36
+++ xmltok.c	31 Jan 2009 06:21:09 -0000	1.37
@@ -8,7 +8,7 @@
 #include "winconfig.h"
 #elif defined(MACOS_CLASSIC)
 #include "macconfig.h"
-#elif defined(__amigaos4__)
+#elif defined(__amigaos__)
 #include "amigaconfig.h"
 #elif defined(__WATCOMC__)
 #include "watcomconfig.h"
@@ -1345,7 +1345,7 @@
 ENCODING *
 XmlInitUnknownEncoding(void *mem,
                        int *table,
-                       CONVERTER convert, 
+                       CONVERTER convert,
                        void *userData)
 {
   int i;
@@ -1639,7 +1639,7 @@
 ENCODING *
 XmlInitUnknownEncodingNS(void *mem,
                          int *table,
-                         CONVERTER convert, 
+                         CONVERTER convert,
                          void *userData)
 {
   ENCODING *enc = XmlInitUnknownEncoding(mem, table, convert, userData);


From ssolie at users.sourceforge.net  Sat Jan 31 07:21:11 2009
From: ssolie at users.sourceforge.net (Steven Solie)
Date: Sat, 31 Jan 2009 06:21:11 +0000
Subject: [Expat-checkins] expat/amiga expat_68k.c, NONE, 1.1 expat_68k.h,
	NONE, 1.1 expat_68k_handler_stubs.c, NONE, 1.1 Makefile, 1.6,
	1.7 README.txt, 1.5, 1.6 expat_lib.c, 1.4, 1.5 launch.c, 1.2, 1.3
Message-ID: <E1LT9E7-00010M-NV@23jxhf1.ch3.sourceforge.com>

Update of /cvsroot/expat/expat/amiga
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3704/amiga

Modified Files:
	Makefile README.txt expat_lib.c launch.c 
Added Files:
	expat_68k.c expat_68k.h expat_68k_handler_stubs.c 
Log Message:
AmigaOS specific changes. See amiga/README.txt for more details.

--- NEW FILE: expat_68k.c ---
/*
** This file was automatically generated by fdtrans.
** Do not edit it by hand. Instead, edit the sfd file
** that was used to generate this file
*/

#ifdef __USE_INLINE__
#undef __USE_INLINE__
#endif

#include <exec/interfaces.h>
#include <exec/libraries.h>
#include <exec/emulation.h>
#include <proto/exec.h>
#include <interfaces/expat.h>
#include "expat_68k.h"


STATIC ULONG stub_OpenPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct LibraryManagerInterface *Self = (struct LibraryManagerInterface *) ExtLib->ILibrary;

	return (ULONG) Self->Open(0);
}
struct EmuTrap stub_Open = { TRAPINST, TRAPTYPE, stub_OpenPPC };

STATIC ULONG stub_ClosePPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct LibraryManagerInterface *Self = (struct LibraryManagerInterface *) ExtLib->ILibrary;

	return (ULONG) Self->Close();
}
struct EmuTrap stub_Close = { TRAPINST, TRAPTYPE, stub_ClosePPC };

STATIC ULONG stub_ExpungePPC(ULONG *regarray)
{
	return 0UL;
}
struct EmuTrap stub_Expunge = { TRAPINST, TRAPTYPE, stub_ExpungePPC };

STATIC ULONG stub_ReservedPPC(ULONG *regarray)
{
	return 0UL;
}
struct EmuTrap stub_Reserved = { TRAPINST, TRAPTYPE, stub_ReservedPPC };

static M68kXML_Parser stub_XML_ParserCreatePPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p;
	p = IExec->AllocVec(sizeof(*p), MEMF_SHARED|MEMF_CLEAR);
	if (p) {
		p->p = Self->XML_ParserCreate((const XML_Char *)regarray[8]);
		if (p->p) {
			Self->XML_SetUserData(p->p, p);
			return p;
		}
		IExec->FreeVec(p);
	}
	return NULL;
}
struct EmuTrap stub_XML_ParserCreate = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_ParserCreatePPC };

static M68kXML_Parser stub_XML_ParserCreateNSPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p;
	p = IExec->AllocVec(sizeof(*p), MEMF_SHARED|MEMF_CLEAR);
	if (p) {
		p->p = Self->XML_ParserCreateNS((const XML_Char *)regarray[8], (XML_Char)regarray[0]);
		if (p->p) {
			Self->XML_SetUserData(p->p, p);
			return p;
		}
		IExec->FreeVec(p);
	}
	return NULL;
}
struct EmuTrap stub_XML_ParserCreateNS = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_ParserCreateNSPPC };

static M68kXML_Parser stub_XML_ParserCreate_MMPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p;
	p = IExec->AllocVec(sizeof(*p), MEMF_SHARED|MEMF_CLEAR);
	if (p) {
		p->p = Self->XML_ParserCreate_MM((const XML_Char *)regarray[8],
			(const XML_Memory_Handling_Suite *)regarray[9],
			(const XML_Char *)regarray[10]);
		if (p->p) {
			Self->XML_SetUserData(p->p, p);
			return p;
		}
		IExec->FreeVec(p);
	}
	return NULL;
}
struct EmuTrap stub_XML_ParserCreate_MM = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_ParserCreate_MMPPC };

static M68kXML_Parser stub_XML_ExternalEntityParserCreatePPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p;
	p = IExec->AllocVec(sizeof(*p), MEMF_SHARED|MEMF_CLEAR);
	if (p) {
		p->p = Self->XML_ExternalEntityParserCreate((XML_Parser)regarray[8],
			(const XML_Char *)regarray[9], (const XML_Char *)regarray[10]);
		if (p->p) {
			Self->XML_SetUserData(p->p, p);
			return p;
		}
		IExec->FreeVec(p);
	}
	return NULL;
}
struct EmuTrap stub_XML_ExternalEntityParserCreate = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_ExternalEntityParserCreatePPC };

static void stub_XML_ParserFreePPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	if (p) {
		Self->XML_ParserFree(p->p);
		IExec->FreeVec(p);
	}
}
struct EmuTrap stub_XML_ParserFree = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_ParserFreePPC };

static int stub_XML_ParsePPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	return Self->XML_Parse(p->p, (const char *)regarray[9], (int)regarray[0], (int)regarray[1]);
}
struct EmuTrap stub_XML_Parse = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_ParsePPC };

static int stub_XML_ParseBufferPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	return Self->XML_ParseBuffer(p->p, (int)regarray[0], (int)regarray[1]);
}
struct EmuTrap stub_XML_ParseBuffer = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_ParseBufferPPC };

static void * stub_XML_GetBufferPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	return Self->XML_GetBuffer(p->p, (int)regarray[0]);
}
struct EmuTrap stub_XML_GetBuffer = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_GetBufferPPC };

static void stub_XML_SetStartElementHandlerPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	p->startelementhandler = (void *)regarray[9];
	Self->XML_SetStartElementHandler(p->p, _68k_startelementhandler);
}
struct EmuTrap stub_XML_SetStartElementHandler = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_SetStartElementHandlerPPC };

static void stub_XML_SetEndElementHandlerPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	p->endelementhandler = (void *)regarray[9];
	Self->XML_SetEndElementHandler(p->p, _68k_endelementhandler);
}
struct EmuTrap stub_XML_SetEndElementHandler = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_SetEndElementHandlerPPC };

static void stub_XML_SetElementHandlerPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	p->startelementhandler = (void *)regarray[9];
	p->endelementhandler = (void *)regarray[10];
	Self->XML_SetElementHandler(p->p, _68k_startelementhandler, _68k_endelementhandler);
}
struct EmuTrap stub_XML_SetElementHandler = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_SetElementHandlerPPC };

static void stub_XML_SetCharacterDataHandlerPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	p->chardatahandler = (void *)regarray[9];
	Self->XML_SetCharacterDataHandler(p->p, _68k_chardatahandler);
}
struct EmuTrap stub_XML_SetCharacterDataHandler = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_SetCharacterDataHandlerPPC };

static void stub_XML_SetProcessingInstructionHandlerPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	p->procinsthandler = (void *)regarray[9];
	Self->XML_SetProcessingInstructionHandler(p->p, _68k_procinsthandler);
}
struct EmuTrap stub_XML_SetProcessingInstructionHandler = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_SetProcessingInstructionHandlerPPC };

static void stub_XML_SetCommentHandlerPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	p->commenthandler = (void *)regarray[9];
	Self->XML_SetCommentHandler(p->p, _68k_commenthandler);
}
struct EmuTrap stub_XML_SetCommentHandler = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_SetCommentHandlerPPC };

static void stub_XML_SetStartCdataSectionHandlerPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	p->startcdatahandler = (void *)regarray[9];
	Self->XML_SetStartCdataSectionHandler(p->p, _68k_startcdatahandler);
}
struct EmuTrap stub_XML_SetStartCdataSectionHandler = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_SetStartCdataSectionHandlerPPC };

static void stub_XML_SetEndCdataSectionHandlerPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	p->endcdatahandler = (void *)regarray[9];
	Self->XML_SetEndCdataSectionHandler(p->p, _68k_endcdatahandler);
}
struct EmuTrap stub_XML_SetEndCdataSectionHandler = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_SetEndCdataSectionHandlerPPC };

static void stub_XML_SetCdataSectionHandlerPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	p->startcdatahandler = (void *)regarray[9];
	p->endcdatahandler = (void *)regarray[10];
	Self->XML_SetCdataSectionHandler(p->p, _68k_startcdatahandler, _68k_endcdatahandler);
}
struct EmuTrap stub_XML_SetCdataSectionHandler = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_SetCdataSectionHandlerPPC };

static void stub_XML_SetDefaultHandlerPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	p->defaulthandler = (void *)regarray[9];
	Self->XML_SetDefaultHandler(p->p, _68k_defaulthandler);
}
struct EmuTrap stub_XML_SetDefaultHandler = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_SetDefaultHandlerPPC };

static void stub_XML_SetDefaultHandlerExpandPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	p->defaulthandlerexp = (void *)regarray[9];
	Self->XML_SetDefaultHandlerExpand(p->p, _68k_defaulthandlerexp);
}
struct EmuTrap stub_XML_SetDefaultHandlerExpand = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_SetDefaultHandlerExpandPPC };

static void stub_XML_SetExternalEntityRefHandlerPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	p->extentrefhandler = (void *)regarray[9];
	Self->XML_SetExternalEntityRefHandler(p->p, _68k_extentrefhandler);
}
struct EmuTrap stub_XML_SetExternalEntityRefHandler = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_SetExternalEntityRefHandlerPPC };

static void stub_XML_SetExternalEntityRefHandlerArgPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	p->extenthandlerarg = (void *)regarray[9];
}
struct EmuTrap stub_XML_SetExternalEntityRefHandlerArg = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_SetExternalEntityRefHandlerArgPPC };

static void stub_XML_SetUnknownEncodingHandlerPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	p->unknownenchandler = (void *)regarray[9];
	p->enchandlerarg = (void *)regarray[10];
	Self->XML_SetUnknownEncodingHandler(p->p, _68k_unknownenchandler, p);
}
struct EmuTrap stub_XML_SetUnknownEncodingHandler = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_SetUnknownEncodingHandlerPPC };

static void stub_XML_SetStartNamespaceDeclHandlerPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	p->startnamespacehandler = (void *)regarray[9];
	Self->XML_SetStartNamespaceDeclHandler(p->p, _68k_startnamespacehandler);
}
struct EmuTrap stub_XML_SetStartNamespaceDeclHandler = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_SetStartNamespaceDeclHandlerPPC };

static void stub_XML_SetEndNamespaceDeclHandlerPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	p->endnamespacehandler = (void *)regarray[9];
	Self->XML_SetEndNamespaceDeclHandler(p->p, _68k_endnamespacehandler);
}
struct EmuTrap stub_XML_SetEndNamespaceDeclHandler = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_SetEndNamespaceDeclHandlerPPC };

static void stub_XML_SetNamespaceDeclHandlerPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	p->startnamespacehandler = (void *)regarray[9];
	p->endnamespacehandler = (void *)regarray[10];
	Self->XML_SetNamespaceDeclHandler(p->p, _68k_startnamespacehandler, _68k_endnamespacehandler);
}
struct EmuTrap stub_XML_SetNamespaceDeclHandler = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_SetNamespaceDeclHandlerPPC };

static void stub_XML_SetXmlDeclHandlerPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	p->xmldeclhandler = (void *)regarray[9];
	Self->XML_SetXmlDeclHandler(p->p, _68k_xmldeclhandler);
}
struct EmuTrap stub_XML_SetXmlDeclHandler = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_SetXmlDeclHandlerPPC };

static void stub_XML_SetStartDoctypeDeclHandlerPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	p->startdoctypehandler = (void *)regarray[9];
	Self->XML_SetStartDoctypeDeclHandler(p->p, _68k_startdoctypehandler);
}
struct EmuTrap stub_XML_SetStartDoctypeDeclHandler = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_SetStartDoctypeDeclHandlerPPC };

static void stub_XML_SetEndDoctypeDeclHandlerPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	p->enddoctypehandler = (void *)regarray[9];
	Self->XML_SetEndDoctypeDeclHandler(p->p, _68k_enddoctypehandler);
}
struct EmuTrap stub_XML_SetEndDoctypeDeclHandler = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_SetEndDoctypeDeclHandlerPPC };

static void stub_XML_SetDoctypeDeclHandlerPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	p->startdoctypehandler = (void *)regarray[9];
	p->enddoctypehandler = (void *)regarray[10];
	Self->XML_SetDoctypeDeclHandler(p->p, _68k_startdoctypehandler, _68k_enddoctypehandler);
}
struct EmuTrap stub_XML_SetDoctypeDeclHandler = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_SetDoctypeDeclHandlerPPC };

static void stub_XML_SetElementDeclHandlerPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	p->elementdeclhandler = (void *)regarray[9];
	Self->XML_SetElementDeclHandler(p->p, _68k_elementdeclhandler);
}
struct EmuTrap stub_XML_SetElementDeclHandler = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_SetElementDeclHandlerPPC };

static void stub_XML_SetAttlistDeclHandlerPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	p->attlistdeclhandler = (void *)regarray[9];
	Self->XML_SetAttlistDeclHandler(p->p, _68k_attlistdeclhandler);
}
struct EmuTrap stub_XML_SetAttlistDeclHandler = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_SetAttlistDeclHandlerPPC };

static void stub_XML_SetEntityDeclHandlerPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	p->entitydeclhandler = (void *)regarray[9];
	Self->XML_SetEntityDeclHandler(p->p, _68k_entitydeclhandler);
}
struct EmuTrap stub_XML_SetEntityDeclHandler = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_SetEntityDeclHandlerPPC };

static void stub_XML_SetUnparsedEntityDeclHandlerPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	p->unparseddeclhandler = (void *)regarray[9];
	Self->XML_SetUnparsedEntityDeclHandler(p->p, _68k_unparseddeclhandler);
}
struct EmuTrap stub_XML_SetUnparsedEntityDeclHandler = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_SetUnparsedEntityDeclHandlerPPC };

static void stub_XML_SetNotationDeclHandlerPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	p->notationdeclhandler = (void *)regarray[9];
	Self->XML_SetNotationDeclHandler(p->p, _68k_notationdeclhandler);
}
struct EmuTrap stub_XML_SetNotationDeclHandler = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_SetNotationDeclHandlerPPC };

static void stub_XML_SetNotStandaloneHandlerPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	p->notstandalonehandler = (void *)regarray[9];
	Self->XML_SetNotStandaloneHandler(p->p, _68k_notstandalonehandler);
}
struct EmuTrap stub_XML_SetNotStandaloneHandler = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_SetNotStandaloneHandlerPPC };

static int stub_XML_GetErrorCodePPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	return Self->XML_GetErrorCode(p->p);
}
struct EmuTrap stub_XML_GetErrorCode = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_GetErrorCodePPC };

static const XML_LChar * stub_XML_ErrorStringPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	return Self->XML_ErrorString((int)regarray[0]);
}
struct EmuTrap stub_XML_ErrorString = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_ErrorStringPPC };

static long stub_XML_GetCurrentByteIndexPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	return Self->XML_GetCurrentByteIndex(p->p);
}
struct EmuTrap stub_XML_GetCurrentByteIndex = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_GetCurrentByteIndexPPC };

static int stub_XML_GetCurrentLineNumberPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	return Self->XML_GetCurrentLineNumber(p->p);
}
struct EmuTrap stub_XML_GetCurrentLineNumber = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_GetCurrentLineNumberPPC };

static int stub_XML_GetCurrentColumnNumberPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	return Self->XML_GetCurrentColumnNumber(p->p);
}
struct EmuTrap stub_XML_GetCurrentColumnNumber = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_GetCurrentColumnNumberPPC };

static int stub_XML_GetCurrentByteCountPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	return Self->XML_GetCurrentByteCount(p->p);
}
struct EmuTrap stub_XML_GetCurrentByteCount = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_GetCurrentByteCountPPC };

static const char * stub_XML_GetInputContextPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	return Self->XML_GetInputContext(p->p, (int *)regarray[9], (int *)regarray[10]);
}
struct EmuTrap stub_XML_GetInputContext = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_GetInputContextPPC };

static void stub_XML_SetUserDataPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	p->handlerarg = (void *)regarray[9];
}
struct EmuTrap stub_XML_SetUserData = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_SetUserDataPPC };

static void stub_XML_DefaultCurrentPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	Self->XML_DefaultCurrent(p->p);
}
struct EmuTrap stub_XML_DefaultCurrent = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_DefaultCurrentPPC };

static void stub_XML_UseParserAsHandlerArgPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	p->handlerarg = p;
}
struct EmuTrap stub_XML_UseParserAsHandlerArg = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_UseParserAsHandlerArgPPC };

static int stub_XML_SetBasePPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	return Self->XML_SetBase(p->p, (const XML_Char *)regarray[9]);
}
struct EmuTrap stub_XML_SetBase = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_SetBasePPC };

static const XML_Char * stub_XML_GetBasePPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	return Self->XML_GetBase(p->p);
}
struct EmuTrap stub_XML_GetBase = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_GetBasePPC };

static int stub_XML_GetSpecifiedAttributeCountPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	return Self->XML_GetSpecifiedAttributeCount(p->p);
}
struct EmuTrap stub_XML_GetSpecifiedAttributeCount = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_GetSpecifiedAttributeCountPPC };

static int stub_XML_GetIdAttributeIndexPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	return Self->XML_GetIdAttributeIndex(p->p);
}
struct EmuTrap stub_XML_GetIdAttributeIndex = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_GetIdAttributeIndexPPC };

static int stub_XML_SetEncodingPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	return Self->XML_SetEncoding(p->p, (const XML_Char *)regarray[9]);
}
struct EmuTrap stub_XML_SetEncoding = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_SetEncodingPPC };

static int stub_XML_SetParamEntityParsingPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	return Self->XML_SetParamEntityParsing(p->p, (enum XML_ParamEntityParsing)regarray[9]);
}
struct EmuTrap stub_XML_SetParamEntityParsing = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_SetParamEntityParsingPPC };

static void stub_XML_SetReturnNSTripletPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	Self->XML_SetReturnNSTriplet(p->p, (int)regarray[0]);
}
struct EmuTrap stub_XML_SetReturnNSTriplet = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_SetReturnNSTripletPPC };

static const XML_LChar * stub_XML_ExpatVersionPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	return Self->XML_ExpatVersion();
}
struct EmuTrap stub_XML_ExpatVersion = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_ExpatVersionPPC };

static XML_Expat_Version stub_XML_ExpatVersionInfoPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	return Self->XML_ExpatVersionInfo();
}
struct EmuTrap stub_XML_ExpatVersionInfo = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_ExpatVersionInfoPPC };

static int stub_XML_ParserResetPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	return Self->XML_ParserReset(p->p, (const XML_Char *)regarray[9]);
}
struct EmuTrap stub_XML_ParserReset = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_ParserResetPPC };

static void stub_XML_SetSkippedEntityHandlerPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	p->skippedentityhandler = (void *)regarray[9];
	Self->XML_SetSkippedEntityHandler(p->p, _68k_skippedentityhandler);
}
struct EmuTrap stub_XML_SetSkippedEntityHandler = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_SetSkippedEntityHandlerPPC };

static int stub_XML_UseForeignDTDPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	M68kXML_Parser p = (M68kXML_Parser)regarray[8];
	return Self->XML_UseForeignDTD(p->p, (XML_Bool)regarray[0]);
}
struct EmuTrap stub_XML_UseForeignDTD = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_UseForeignDTDPPC };

static const XML_Feature * stub_XML_GetFeatureListPPC(ULONG *regarray)
{
	struct Library *Base = (struct Library *) regarray[REG68K_A6/4];
	struct ExtendedLibrary *ExtLib = (struct ExtendedLibrary *) ((ULONG)Base + Base->lib_PosSize);
	struct ExpatIFace *Self = (struct ExpatIFace *) ExtLib->MainIFace;

	return Self->XML_GetFeatureList();
}
struct EmuTrap stub_XML_GetFeatureList = { TRAPINST, TRAPTYPE, (ULONG (*)(ULONG *))stub_XML_GetFeatureListPPC };

ULONG VecTable68K[] = {
	(ULONG)&stub_Open,
	(ULONG)&stub_Close,
	(ULONG)&stub_Expunge,
	(ULONG)&stub_Reserved,
	(ULONG)&stub_XML_ParserCreate,
	(ULONG)&stub_XML_ParserCreateNS,
	(ULONG)&stub_XML_ParserCreate_MM,
	(ULONG)&stub_XML_ExternalEntityParserCreate,
	(ULONG)&stub_XML_ParserFree,
	(ULONG)&stub_XML_Parse,
	(ULONG)&stub_XML_ParseBuffer,
	(ULONG)&stub_XML_GetBuffer,
	(ULONG)&stub_XML_SetStartElementHandler,
	(ULONG)&stub_XML_SetEndElementHandler,
	(ULONG)&stub_XML_SetElementHandler,
	(ULONG)&stub_XML_SetCharacterDataHandler,
	(ULONG)&stub_XML_SetProcessingInstructionHandler,
	(ULONG)&stub_XML_SetCommentHandler,
	(ULONG)&stub_XML_SetStartCdataSectionHandler,
	(ULONG)&stub_XML_SetEndCdataSectionHandler,
	(ULONG)&stub_XML_SetCdataSectionHandler,
	(ULONG)&stub_XML_SetDefaultHandler,
	(ULONG)&stub_XML_SetDefaultHandlerExpand,
	(ULONG)&stub_XML_SetExternalEntityRefHandler,
	(ULONG)&stub_XML_SetExternalEntityRefHandlerArg,
	(ULONG)&stub_XML_SetUnknownEncodingHandler,
	(ULONG)&stub_XML_SetStartNamespaceDeclHandler,
	(ULONG)&stub_XML_SetEndNamespaceDeclHandler,
	(ULONG)&stub_XML_SetNamespaceDeclHandler,
	(ULONG)&stub_XML_SetXmlDeclHandler,
	(ULONG)&stub_XML_SetStartDoctypeDeclHandler,
	(ULONG)&stub_XML_SetEndDoctypeDeclHandler,
	(ULONG)&stub_XML_SetDoctypeDeclHandler,
	(ULONG)&stub_XML_SetElementDeclHandler,
	(ULONG)&stub_XML_SetAttlistDeclHandler,
	(ULONG)&stub_XML_SetEntityDeclHandler,
	(ULONG)&stub_XML_SetUnparsedEntityDeclHandler,
	(ULONG)&stub_XML_SetNotationDeclHandler,
	(ULONG)&stub_XML_SetNotStandaloneHandler,
	(ULONG)&stub_XML_GetErrorCode,
	(ULONG)&stub_XML_ErrorString,
	(ULONG)&stub_XML_GetCurrentByteIndex,
	(ULONG)&stub_XML_GetCurrentLineNumber,
	(ULONG)&stub_XML_GetCurrentColumnNumber,
	(ULONG)&stub_XML_GetCurrentByteCount,
	(ULONG)&stub_XML_GetInputContext,
	(ULONG)&stub_XML_SetUserData,
	(ULONG)&stub_XML_DefaultCurrent,
	(ULONG)&stub_XML_UseParserAsHandlerArg,
	(ULONG)&stub_XML_SetBase,
	(ULONG)&stub_XML_GetBase,
	(ULONG)&stub_XML_GetSpecifiedAttributeCount,
	(ULONG)&stub_XML_GetIdAttributeIndex,
	(ULONG)&stub_XML_SetEncoding,
	(ULONG)&stub_XML_SetParamEntityParsing,
	(ULONG)&stub_XML_SetReturnNSTriplet,
	(ULONG)&stub_XML_ExpatVersion,
	(ULONG)&stub_XML_ExpatVersionInfo,
	(ULONG)&stub_XML_ParserReset,
	(ULONG)&stub_XML_SetSkippedEntityHandler,
	(ULONG)&stub_XML_UseForeignDTD,
	(ULONG)&stub_XML_GetFeatureList,
	(ULONG)-1
};

--- NEW FILE: expat_68k.h ---
#ifndef EXPAT_68K_H
#define EXPAT_68K_H

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

typedef struct M68kXML_ParserStruct {
	XML_Parser p;
	void *handlerarg;
	void *extenthandlerarg;
	void *enchandlerarg;
	void *startelementhandler;
	void *endelementhandler;
	void *chardatahandler;
	void *procinsthandler;
	void *commenthandler;
	void *startcdatahandler;
	void *endcdatahandler;
	void *defaulthandler;
	void *defaulthandlerexp;
	void *extentrefhandler;
	void *unknownenchandler;
	void *startnamespacehandler;
	void *endnamespacehandler;
	void *xmldeclhandler;
	void *startdoctypehandler;
	void *enddoctypehandler;
	void *elementdeclhandler;
	void *attlistdeclhandler;
	void *entitydeclhandler;
	void *unparseddeclhandler;
	void *notationdeclhandler;
	void *notstandalonehandler;
	void *skippedentityhandler;
} *M68kXML_Parser;

/* expat_68k_handler_stubs.c */
void _68k_startelementhandler(void *userdata, const char *name, const char **attrs);
void _68k_endelementhandler(void *userdata, const char *name);
void _68k_chardatahandler(void *userdata, const char *s, int len);
void _68k_procinsthandler(void *userdata, const char *target, const char *data);
void _68k_commenthandler(void *userdata, const char *data);
void _68k_startcdatahandler(void *userdata);
void _68k_endcdatahandler(void *userdata);
void _68k_defaulthandler(void *userdata, const char *s, int len);
void _68k_defaulthandlerexp(void *userdata, const char *s, int len);
int _68k_extentrefhandler(XML_Parser parser, const char *context, const char *base,
	const char *sysid, const char *pubid);
int _68k_unknownenchandler(void *enchandlerdata, const char *name, XML_Encoding *info);
void _68k_startnamespacehandler(void *userdata, const char *prefix, const char *uri);
void _68k_endnamespacehandler(void *userdata, const char *prefix);
void _68k_xmldeclhandler(void *userdata, const char *version, const char *encoding, int standalone);
void _68k_startdoctypehandler(void *userdata, const char *doctypename,
	const char *sysid, const char *pubid, int has_internal_subset);
void _68k_enddoctypehandler(void *userdata);
void _68k_elementdeclhandler(void *userdata, const char *name, XML_Content *model);
void _68k_attlistdeclhandler(void *userdata, const char *elname, const char *attname,
	const char *att_type, const char *dflt, int isrequired);
void _68k_entitydeclhandler(void *userdata, const char *entityname, int is_param_entity,
	const char *value, int value_length, const char *base, const char *sysid, const char *pubid,
	const char *notationname);
void _68k_unparseddeclhandler(void *userdata, const char *entityname, const char *base,
	const char *sysid, const char *pubid, const char *notationname);
void _68k_notationdeclhandler(void *userdata, const char *notationname, const char *base,
	const char *sysid, const char *pubid);
int _68k_notstandalonehandler(void *userdata);
void _68k_skippedentityhandler(void *userdata, const char *entityname, int is_param_entity);

#endif

--- NEW FILE: expat_68k_handler_stubs.c ---
#include "expat_68k.h"
#include <exec/emulation.h>
#include <proto/exec.h>
#include <stdarg.h>

static uint32 VARARGS68K call_68k_code (void *code, int num_args, ...) {
	uint32 res = 0;

	va_list vargs;
	va_startlinear(vargs, num_args);
	uint32 *args = va_getlinearva(vargs, uint32 *);

	uint8 *stack = AllocVec(4096, MEMF_SHARED);
	if (stack) {
		uint32 *sp = (uint32 *)(stack + 4096);
		args += num_args;
		while (num_args--) {
			*--sp = *--args;
		}

		res = EmulateTags(code, ET_StackPtr, sp, TAG_END);
		FreeVec(stack);
	}

	va_end(vargs);

	return res;
}

void _68k_startelementhandler(void *userdata, const char *name, const char **attrs) {
	M68kXML_Parser p = userdata;
	call_68k_code(p->startelementhandler, 3, p->handlerarg, name, attrs);
}

void _68k_endelementhandler(void *userdata, const char *name) {
	M68kXML_Parser p = userdata;
	call_68k_code(p->endelementhandler, 2, p->handlerarg, name);
}

void _68k_chardatahandler(void *userdata, const char *s, int len) {
	M68kXML_Parser p = userdata;
	call_68k_code(p->chardatahandler, 3, p->handlerarg, s, len);
}

void _68k_procinsthandler(void *userdata, const char *target, const char *data) {
	M68kXML_Parser p = userdata;
	call_68k_code(p->procinsthandler, 3, p->handlerarg, target, data);
}

void _68k_commenthandler(void *userdata, const char *data) {
	M68kXML_Parser p = userdata;
	call_68k_code(p->commenthandler, 2, p->handlerarg, data);
}

void _68k_startcdatahandler(void *userdata) {
	M68kXML_Parser p = userdata;
	call_68k_code(p->startcdatahandler, 1, p->handlerarg);
}

void _68k_endcdatahandler(void *userdata) {
	M68kXML_Parser p = userdata;
	call_68k_code(p->endcdatahandler, 1, p->handlerarg);
}

void _68k_defaulthandler(void *userdata, const char *s, int len) {
	M68kXML_Parser p = userdata;
	call_68k_code(p->defaulthandler, 3, p->handlerarg, s, len);
}

void _68k_defaulthandlerexp(void *userdata, const char *s, int len) {
	M68kXML_Parser p = userdata;
	call_68k_code(p->defaulthandlerexp, 3, p->handlerarg, s, len);
}

int _68k_extentrefhandler(XML_Parser parser, const char *context, const char *base,
	const char *sysid, const char *pubid)
{
	M68kXML_Parser p = XML_GetUserData(parser);
	void *arg = p->extenthandlerarg;
	return (int)call_68k_code(p->extentrefhandler, 5, arg ? arg : p, context, base, sysid, pubid);
}

int _68k_unknownenchandler(void *enchandlerdata, const char *name, XML_Encoding *info) {
	M68kXML_Parser p = enchandlerdata;
	return (int)call_68k_code(p->unknownenchandler, 3, p->enchandlerarg, name, info);
}

void _68k_startnamespacehandler(void *userdata, const char *prefix, const char *uri) {
	M68kXML_Parser p = userdata;
	call_68k_code(p->startnamespacehandler, 3, p->handlerarg, prefix, uri);
}

void _68k_endnamespacehandler(void *userdata, const char *prefix) {
	M68kXML_Parser p = userdata;
	call_68k_code(p->endnamespacehandler, 2, p->handlerarg, prefix);
}

void _68k_xmldeclhandler(void *userdata, const char *version, const char *encoding, int standalone) {
	M68kXML_Parser p = userdata;
	call_68k_code(p->xmldeclhandler, 4, p->handlerarg, version, encoding, standalone);
}

void _68k_startdoctypehandler(void *userdata, const char *doctypename,
	const char *sysid, const char *pubid, int has_internal_subset)
{
	M68kXML_Parser p = userdata;
	call_68k_code(p->startdoctypehandler, 5, p->handlerarg, doctypename, sysid, pubid, has_internal_subset);
}

void _68k_enddoctypehandler(void *userdata) {
	M68kXML_Parser p = userdata;
	call_68k_code(p->enddoctypehandler, 1, p->handlerarg);
}

void _68k_elementdeclhandler(void *userdata, const char *name, XML_Content *model) {
	M68kXML_Parser p = userdata;
	call_68k_code(p->elementdeclhandler, 3, p->handlerarg, name, model);
}

void _68k_attlistdeclhandler(void *userdata, const char *elname, const char *attname,
	const char *att_type, const char *dflt, int isrequired)
{
	M68kXML_Parser p = userdata;
	call_68k_code(p->attlistdeclhandler, 6, p->handlerarg, elname, attname, att_type, dflt, isrequired);
}

void _68k_entitydeclhandler(void *userdata, const char *entityname, int is_param_entity,
	const char *value, int value_length, const char *base, const char *sysid, const char *pubid,
	const char *notationname)
{
	M68kXML_Parser p = userdata;
	call_68k_code(p->entitydeclhandler, 9, p->handlerarg, entityname, is_param_entity,
		value, value_length, base, sysid, pubid, notationname);
}

void _68k_unparseddeclhandler(void *userdata, const char *entityname, const char *base,
	const char *sysid, const char *pubid, const char *notationname)
{
	M68kXML_Parser p = userdata;
	call_68k_code(p->unparseddeclhandler, 6, p->handlerarg, entityname, base, sysid, pubid, notationname);
}

void _68k_notationdeclhandler(void *userdata, const char *notationname, const char *base,
	const char *sysid, const char *pubid)
{
	M68kXML_Parser p = userdata;
	call_68k_code(p->notationdeclhandler, 5, p->handlerarg, notationname, base, sysid, pubid);
}

int _68k_notstandalonehandler(void *userdata) {
	M68kXML_Parser p = userdata;
	return (int)call_68k_code(p->notstandalonehandler, 1, p->handlerarg);
}

void _68k_skippedentityhandler(void *userdata, const char *entityname, int is_param_entity) {
	M68kXML_Parser p = userdata;
	call_68k_code(p->skippedentityhandler, 3, p->handlerarg, entityname, is_param_entity);
}

Index: Makefile
===================================================================
RCS file: /cvsroot/expat/expat/amiga/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile	3 Jun 2007 14:58:37 -0000	1.6
+++ Makefile	31 Jan 2009 06:21:09 -0000	1.7
@@ -2,186 +2,329 @@
 # Makefile for AmigaOS
 #
 
-.PHONY: help all staticlib sharedlib check clean install
+.PHONY: help all check clean package
+.PHONY: clib2 newlib library so
 
-vpath %.c ../lib ../examples ../xmlwf ../tests
+vpath %.c ../lib ../examples ../xmlwf ../tests ../tests/benchmark
 vpath %.h ../lib ../tests
 
-
-#
-# Set these for SDK installation.
-#
-tooldir = SDK:Local/C
-staticlibdir = SDK:Local/clib2/lib
-staticincludedir = SDK:Local/clib2/include
-sharedlibdir = SDK:Local/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
-
+#############################################################################
 
 help:
 	@echo "Requires:"
-	@echo " AmigaOS 4.0"
-	@echo " SDK 51.22"
-	@echo " clib2 1.202"
+	@echo " AmigaOS 4.x"
+	@echo " SDK 53.13"
 	@echo ""
 	@echo "Targets:"
-	@echo " all - make expat libraries, xmlwf, examples and run test suite"
+	@echo " all     - make libraries, xmlwf, examples and runs tests"
 	@echo " install - install expat libraries and tools into SDK"
+	@echo " clean   - clean object files"
+	@echo " package - prepare distribution archive"
 
-all:
-	-makedir force lib libs
-	$(MAKE) staticlib
-	$(MAKE) sharedlib
+all: clib2 newlib library so check
 
-staticlib: $(STATICLIB) $(XMLWF) $(ELEMENTS) $(OUTLINE) $(RUNTESTS) $(BENCHMARK) check
-	@echo done
+clib2: clib2/libexpat.a clib2/xmlwf clib2/elements clib2/outline clib2/runtests clib2/benchmark
 
-sharedlib: $(SHAREDLIB) $(XMLWF) $(ELEMENTS) $(OUTLINE) $(RUNTESTS) $(BENCHMARK) check
-	@echo done
+newlib: newlib/libexpat.a newlib/xmlwf newlib/elements newlib/outline newlib/runtests newlib/benchmark
 
-check:
-	$(RUNTESTS)
+library: libs/expat.library libs/xmlwf libs/elements libs/outline libs/runtests libs/benchmark
+
+so: so/libexpat.so so/xmlwf so/elements so/outline so/runtests so/benchmark
+
+check: clib2/runtests newlib/runtests libs/runtests so/runtests
+	clib2/runtests
+	newlib/runtests
+	libs/runtests
+	so/runtests
 
 clean:
-	-delete lib/#?.o quiet
+	-delete clib2/#?.o quiet
+	-delete newlib/#?.o quiet
 	-delete libs/#?.o quiet
+	-delete so/#?.o quiet
 
-install:
-	copy libs/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
+package:
+	$(MAKE) all
+	-delete T:expat all force quiet
+	makedir all T:expat/Workbench/Libs
+	copy clone libs/expat.library T:expat/Workbench/Libs
+	makedir all T:expat/SDK/Local/C
+	copy clone libs/xmlwf T:expat/SDK/Local/C
+	makedir all T:expat/SDK/Local/clib2/lib
+	copy clone clib2/libexpat.a T:expat/SDK/Local/clib2/lib
+	makedir all T:expat/SDK/Local/newlib/lib
+	copy clone newlib/libexpat.a T:expat/SDK/Local/newlib/lib
+	makedir all T:expat/SDK/Local/common/include
+	copy clone /lib/expat.h /lib/expat_external.h T:expat/SDK/Local/common/include
+	makedir all T:expat/SDK/Include/include_h/inline4
+	copy clone include/inline4/expat.h T:expat/SDK/Include/include_h/inline4
+	makedir all T:expat/SDK/Include/include_h/interfaces
+	copy clone include/interfaces/expat.h T:expat/SDK/Include/include_h/interfaces
+	makedir all T:expat/SDK/Include/include_h/libraries
+	copy clone include/libraries/expat.h T:expat/SDK/Include/include_h/libraries
+	makedir all T:expat/SDK/Include/include_h/proto
+	copy clone include/proto/expat.h T:expat/SDK/Include/include_h/proto
+	makedir all T:expat/SDK/Documentation/Libs/Expat
+	copy clone /COPYING T:expat/SDK/Documentation/Libs/Expat
+	copy clone /README T:expat/SDK/Documentation/Libs/Expat
+	copy clone README.txt T:expat/SDK/Documentation/Libs/Expat/README.AmigaOS
+	-delete expat.lha
+	lha -r a expat.lha T:expat
 
+#############################################################################
 
-CC = gcc
-LIBTOOL = ar
-STRIP = strip
+CC         := gcc
+LIBTOOL    := ar
+STRIP      := strip
 
-LDFLAGS =
-LIBS =
-CFLAGS = -DNDEBUG -O2
-LTFLAGS = -crs
-STRIPFLAGS = -R.comment
-LAUNCH =
+CFLAGS     := -DNDEBUG -O3
+LTFLAGS    := -crs
+STRIPFLAGS := -R.comment
 
-ifeq ($(MAKECMDGOALS), staticlib)
- CFLAGS += -mcrt=clib2
- LDFLAGS += -mcrt=clib2
- LIBS += $(STATICLIB)
- INCLUDES = -I../lib
-endif
+#############################################################################
 
-ifeq ($(MAKECMDGOALS), sharedlib)
- CFLAGS += -mcrt=newlib -D__USE_INLINE__
- LDFLAGS += -mcrt=newlib
- INCLUDES = -I. -Iinclude -Iinclude/libraries -I../lib
- LAUNCH = $(DESTDIR)/launch.o
-endif
+clib2/libexpat.a: clib2/xmlparse.o clib2/xmltok.o clib2/xmlrole.o
+	$(LIBTOOL) $(LTFLAGS) $@ $^
 
+clib2/xmlparse.o: xmlparse.c expat.h xmlrole.h xmltok.h \
+	expat_external.h internal.h amigaconfig.h
 
-COMPILE = $(CC) $(CFLAGS) $(INCLUDES) -c
+clib2/xmlrole.o: xmlrole.c ascii.h xmlrole.h expat_external.h \
+	internal.h amigaconfig.h
 
-LINK = $(CC) $(LDFLAGS) -o $@
+clib2/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
 
+#############################################################################
 
-$(STATICLIB): $(DESTDIR)/xmlparse.o $(DESTDIR)/xmltok.o $(DESTDIR)/xmlrole.o
+clib2/xmlwf: clib2/xmlwf.o clib2/xmlfile.o clib2/codepage.o clib2/readfilemap.o
+	$(CC) -mcrt=clib2 $^ -o $@ clib2/libexpat.a
+	$(STRIP) $(STRIPFLAGS) $@
+
+clib2/xmlwf.o: xmlwf.c
+
+clib2/xmlfile.o: xmlfile.c
+
+clib2/codepage.o: codepage.c
+
+clib2/readfilemap.o: readfilemap.c
+
+#############################################################################
+
+clib2/elements: clib2/elements.o
+	$(CC) -mcrt=clib2 $^ -o $@ clib2/libexpat.a
+	$(STRIP) $(STRIPFLAGS) $@
+
+clib2/elements.o: elements.c
+
+#############################################################################
+
+clib2/outline: clib2/outline.o
+	$(CC) -mcrt=clib2 $^ -o $@ clib2/libexpat.a
+	$(STRIP) $(STRIPFLAGS) $@
+
+clib2/outline.o: outline.c
+
+#############################################################################
+
+clib2/runtests: clib2/runtests.o clib2/chardata.o clib2/minicheck.o
+	$(CC) -mcrt=clib2 $^ -o $@ clib2/libexpat.a
+
+clib2/chardata.o: chardata.c chardata.h
+
+clib2/minicheck.o: minicheck.c minicheck.h
+
+clib2/runtests.o: runtests.c chardata.h
+
+#############################################################################
+
+clib2/benchmark: clib2/benchmark.o
+	$(CC) -mcrt=clib2 $^ -o $@ clib2/libexpat.a -lm
+
+clib2/benchmark.o: benchmark.c
+
+#############################################################################
+
+newlib/libexpat.a: newlib/xmlparse.o newlib/xmltok.o newlib/xmlrole.o
 	$(LIBTOOL) $(LTFLAGS) $@ $^
 
-$(DESTDIR)/xmlparse.o: xmlparse.c expat.h xmlrole.h xmltok.h \
+newlib/xmlparse.o: xmlparse.c expat.h xmlrole.h xmltok.h \
 	expat_external.h internal.h amigaconfig.h
-	$(COMPILE) $< -o $@
 
-$(DESTDIR)/xmlrole.o: xmlrole.c ascii.h xmlrole.h expat_external.h \
+newlib/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 \
+newlib/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 $@ $^
+newlib/xmlwf: newlib/xmlwf.o newlib/xmlfile.o newlib/codepage.o newlib/readfilemap.o
+	$(CC) -mcrt=newlib $^ -o $@ newlib/libexpat.a
+	$(STRIP) $(STRIPFLAGS) $@
 
-$(DESTDIR)/expat_lib.o: expat_lib.c
-	$(COMPILE) $< -o $@
+newlib/xmlwf.o: xmlwf.c
 
-$(DESTDIR)/expat_vectors.o: expat_vectors.c
-	$(COMPILE) $< -o $@
+newlib/xmlfile.o: xmlfile.c
 
-$(DESTDIR)/stdlib.o: stdlib.c
-	$(COMPILE) $< -o $@
+newlib/codepage.o: codepage.c
 
-$(LAUNCH): launch.c
-	$(COMPILE) $< -o $@
+newlib/readfilemap.o: readfilemap.c
 
+#############################################################################
 
-$(XMLWF): $(DESTDIR)/xmlwf.o $(DESTDIR)/xmlfile.o $(DESTDIR)/codepage.o $(DESTDIR)/readfilemap.o $(LAUNCH)
-	$(LINK) $^ $(LIBS)
+newlib/elements: newlib/elements.o
+	$(CC) -mcrt=newlib $^ -o $@ newlib/libexpat.a
 	$(STRIP) $(STRIPFLAGS) $@
 
-$(DESTDIR)/xmlwf.o: xmlwf.c
-	$(COMPILE) $< -o $@
+newlib/elements.o: elements.c
 
-$(DESTDIR)/xmlfile.o: xmlfile.c
-	$(COMPILE) $< -o $@
+#############################################################################
 
-$(DESTDIR)/codepage.o: codepage.c
-	$(COMPILE) $< -o $@
+newlib/outline: newlib/outline.o
+	$(CC) -mcrt=newlib $^ -o $@ newlib/libexpat.a
+	$(STRIP) $(STRIPFLAGS) $@
 
-$(DESTDIR)/readfilemap.o: readfilemap.c
-	$(COMPILE) $< -o $@
+newlib/outline.o: outline.c
 
+#############################################################################
 
-$(ELEMENTS): $(DESTDIR)/elements.o $(LAUNCH)
-	$(LINK) $^ $(LIBS)
+newlib/runtests: newlib/runtests.o newlib/chardata.o newlib/minicheck.o
+	$(CC) -mcrt=newlib $^ -o $@ newlib/libexpat.a
+
+newlib/chardata.o: chardata.c chardata.h
+
+newlib/minicheck.o: minicheck.c minicheck.h
+
+newlib/runtests.o: runtests.c chardata.h
+
+#############################################################################
+
+newlib/benchmark: newlib/benchmark.o
+	$(CC) -mcrt=newlib $^ -o $@ newlib/libexpat.a
+
+newlib/benchmark.o: benchmark.c
+
+#############################################################################
+
+libs/expat.library: libs/expat_lib.o libs/expat_68k.o libs/expat_68k_handler_stubs.o libs/expat_vectors.o libs/stdlib.o newlib/libexpat.a
+	$(CC) -mcrt=newlib -nostartfiles -nostdlib $^ -o $@ newlib/libexpat.a
+
+libs/expat_lib.o: expat_lib.c
+
+libs/expat_68k.o: expat_68k.c expat_68k.h
+
+libs/expat_68k_handler_stubs.o: expat_68k_handler_stubs.c expat_68k.h
+
+libs/expat_vectors.o: expat_vectors.c
+
+libs/stdlib.o: stdlib.c
+
+libs/launch.o: launch.c
+
+#############################################################################
+
+libs/xmlwf: libs/xmlwf.o libs/xmlfile.o libs/codepage.o libs/readfilemap.o libs/launch.o
+	$(CC) -mcrt=newlib $^ -o $@
 	$(STRIP) $(STRIPFLAGS) $@
 
-$(DESTDIR)/elements.o: elements.c
-	$(COMPILE) $< -o $@
+libs/xmlwf.o: xmlwf.c
 
+libs/xmlfile.o: xmlfile.c
 
-$(OUTLINE): $(DESTDIR)/outline.o $(LAUNCH)
-	$(LINK) $^ $(LIBS)
+libs/codepage.o: codepage.c
+
+libs/readfilemap.o: readfilemap.c
+
+#############################################################################
+
+libs/elements: libs/elements.o libs/launch.o
+	$(CC) -mcrt=newlib $^ -o $@
 	$(STRIP) $(STRIPFLAGS) $@
 
-$(DESTDIR)/outline.o: outline.c
-	$(COMPILE) $< -o $@
+libs/elements.o: elements.c
 
+#############################################################################
 
-$(RUNTESTS): $(DESTDIR)/runtests.o $(DESTDIR)/chardata.o $(DESTDIR)/minicheck.o $(LAUNCH)
-	$(LINK) $^ $(LIBS)
+libs/outline: libs/outline.o libs/launch.o
+	$(CC) -mcrt=newlib $^ -o $@
+	$(STRIP) $(STRIPFLAGS) $@
 
-$(DESTDIR)/chardata.o: chardata.c chardata.h
-	$(COMPILE) $< -o $@
+libs/outline.o: outline.c
 
-$(DESTDIR)/minicheck.o: minicheck.c minicheck.h
-	$(COMPILE) $< -o $@
+#############################################################################
 
-$(DESTDIR)/runtests.o: runtests.c chardata.h
-	$(COMPILE) $< -o $@
+libs/runtests: libs/runtests.o libs/chardata.o libs/minicheck.o libs/launch.o
+	$(CC) -mcrt=newlib $^ -o $@
 
+libs/chardata.o: chardata.c chardata.h
 
-$(BENCHMARK): $(DESTDIR)/benchmark.o $(LAUNCH)
-	$(LINK) $^ $(LIBS) -lm
+libs/minicheck.o: minicheck.c minicheck.h
 
-$(DESTDIR)/benchmark.o: benchmark/benchmark.c
-	$(COMPILE) $< -o $@
+libs/runtests.o: runtests.c chardata.h
+
+#############################################################################
+
+libs/benchmark: libs/benchmark.o libs/launch.o
+	$(CC) -mcrt=newlib $^ -o $@
+
+libs/benchmark.o: benchmark.c
+
+#############################################################################
+
+so/libexpat.so: so/xmlparse.o so/xmltok.o so/xmlrole.o
+	$(CC) -mcrt=newlib -shared -o $@ $^
+
+so/xmlparse.o: xmlparse.c expat.h xmlrole.h xmltok.h \
+	expat_external.h internal.h amigaconfig.h
+
+so/xmlrole.o: xmlrole.c ascii.h xmlrole.h expat_external.h \
+	internal.h amigaconfig.h
+
+so/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
+
+#############################################################################
+
+so/xmlwf: newlib/xmlwf.o newlib/xmlfile.o newlib/codepage.o newlib/readfilemap.o
+	$(CC) -mcrt=newlib -use-dynld $^ -o $@ -Lso -lexpat
+	$(STRIP) $(STRIPFLAGS) $@
+
+#############################################################################
+
+so/elements: newlib/elements.o
+	$(CC) -mcrt=newlib -use-dynld $^ -o $@ -Lso -lexpat
+	$(STRIP) $(STRIPFLAGS) $@
+
+#############################################################################
+
+so/outline: newlib/outline.o
+	$(CC) -mcrt=newlib -use-dynld $^ -o $@ -Lso -lexpat
+	$(STRIP) $(STRIPFLAGS) $@
+
+#############################################################################
+
+so/runtests: newlib/runtests.o newlib/chardata.o newlib/minicheck.o
+	$(CC) -mcrt=newlib -use-dynld $^ -o $@ -Lso -lexpat
+
+#############################################################################
+
+so/benchmark: newlib/benchmark.o
+	$(CC) -mcrt=newlib -use-dynld $^ -o $@ -Lso -lexpat
+
+#############################################################################
+
+clib2/%.o: %.c
+	$(CC) -mcrt=clib2 $(CFLAGS) -I../lib -c $< -o $@
+
+newlib/%.o: %.c
+	$(CC) -mcrt=newlib $(CFLAGS) -I../lib -c $< -o $@
+
+libs/%.o: %.c
+	$(CC) -mcrt=newlib $(CFLAGS) -D__USE_INLINE__ -I. -Iinclude -Iinclude/libraries -I../lib -c $< -o $@
+
+so/%.o: %.c
+	$(CC) -mcrt=newlib $(CFLAGS) -fPIC -I../lib -c $< -o $@

Index: README.txt
===================================================================
RCS file: /cvsroot/expat/expat/amiga/README.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- README.txt	3 Jun 2007 14:58:37 -0000	1.5
+++ README.txt	31 Jan 2009 06:21:09 -0000	1.6
@@ -1,19 +1,56 @@
 SUMMARY
 =======
-This is a port of expat for AmigaOS 4.0 which includes the
+This is a port of expat for AmigaOS 4.x which includes the
 SDK, some XML tools and the libraries.
 
-Both static and shared library versions are supported.
+Four library flavours are supported:
+1. static clib2 (libexpat.a)
+2. static newlib (libexpat.a)
+3. AmigaOS library (expat.library)
+4. AmigaOS shared object library (libexpat.so)
 
-The static library version is limited to clib2 although it should
-be possible to use newlib with the appopriate compile options.
+The AmigaOS library version is based on the work of Fredrik Wikstrom.
 
-The shared library version is based on the work of Fredrik Wikstrom
-and is currently limited to PPC only.
+
+BUILDING
+========
+To build all the library flavours, all the tools, examples and run the
+test suite, simply type 'make all' in the amiga subdirectory.
+
+
+INSTALLATION
+============
+To install expat into the standard 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.
+
+
+SOURCE CODE
+===========
+The source code is actively maintained and merged with the official
+Expat repository available at http://expat.sourceforge.net/
 
 
 HISTORY
 =======
+5.0  - integrated 68k patches from Fredrik Wikstrom which means
+       expat.library is now callable from 68k code
+     - bumped version for the addition of the 68k interface so
+       executables can explicitly ask for version 5 and know
+       it includes the 68k interface
+     - refactored Makefile to avoid recursive make calls and
+       build all the library flavours
+     - added static newlib version
+     - added shared objects version
+     - added package target to Makefile
+     - compiled with SDK 53.13 (GCC 4.2.4) at -O3
+
 4.2  - updated to correspond to Expat 2.0.1 release
      - bumped copyright banners and versions
      - simplified amigaconfig.h
@@ -38,29 +75,6 @@
      - based on expat 1.95.8
 
 
-BUILDING
-========
-To build expat.library, xmlwf tool, examples and run the test suite,
-simply type 'make all' in the amiga subdirectory.
-
-The test suite will compile and run for both the static and shared
-library versions.
-
-
-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)
-- provide 68k backwards compatibility

Index: expat_lib.c
===================================================================
RCS file: /cvsroot/expat/expat/amiga/expat_lib.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- expat_lib.c	3 Jun 2007 14:55:49 -0000	1.4
+++ expat_lib.c	31 Jan 2009 06:21:09 -0000	1.5
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2001-2007 Expat maintainers.
+** Copyright (c) 2001-2009 Expat maintainers.
 **
 ** Permission is hereby granted, free of charge, to any person obtaining
 ** a copy of this software and associated documentation files (the
@@ -8,10 +8,10 @@
 ** 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.
@@ -26,9 +26,9 @@
 
 #define LIBNAME		"expat.library"
 #define LIBPRI		0
-#define VERSION		4
-#define REVISION	2
-#define VSTRING		"expat.library 4.2 (2.6.2007)"  /* dd.mm.yyyy */
+#define VERSION		5
+#define REVISION	0
+#define VSTRING		"expat.library 5.0 (30.1.2009)"  /* dd.mm.yyyy */
 
 
 static const char* __attribute__((used)) verstag = "\0$VER: " VSTRING;
@@ -87,10 +87,13 @@
 };
 
 
+extern void *VecTable68K[];
+
 static struct TagItem libCreateTags[] = {
 	{ CLT_DataSize, sizeof(struct ExpatBase) },
 	{ CLT_InitFunc, (uint32)libInit },
 	{ CLT_Interfaces, (uint32)libInterfaces },
+	{ CLT_Vector68K, (uint32)VecTable68K },
 	{ TAG_END, 0 }
 };
 

Index: launch.c
===================================================================
RCS file: /cvsroot/expat/expat/amiga/launch.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- launch.c	3 Jun 2007 15:00:09 -0000	1.2
+++ launch.c	31 Jan 2009 06:21:09 -0000	1.3
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2001-2007 Expat maintainers.
+** Copyright (c) 2001-2009 Expat maintainers.
 **
 ** Permission is hereby granted, free of charge, to any person obtaining
 ** a copy of this software and associated documentation files (the
@@ -8,10 +8,10 @@
 ** 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.
@@ -34,8 +34,9 @@
 
 void setup()
 {
-	ExpatBase = OpenLibrary("expat.library", 4);
+	ExpatBase = OpenLibrary("expat.library", 5);
 	IExpat = (struct ExpatIFace*)GetInterface(ExpatBase, "main", 1, NULL);
+
 	if ( IExpat == 0 )  {
 		DebugPrintF("Can't open expat.library\n");
 	}
@@ -44,13 +45,9 @@
 
 void cleanup()
 {
-	if ( IExpat != 0 )  {
-		DropInterface((struct Interface*)IExpat);
-		IExpat = 0;
-	}
+	DropInterface((struct Interface*)IExpat);
+	IExpat = 0;
 
-	if ( ExpatBase != 0 )  {
-		CloseLibrary(ExpatBase);
-		ExpatBase = 0;
-	}
+	CloseLibrary(ExpatBase);
+	ExpatBase = 0;
 }


From ssolie at users.sourceforge.net  Sat Jan 31 21:57:36 2009
From: ssolie at users.sourceforge.net (Steven Solie)
Date: Sat, 31 Jan 2009 20:57:36 +0000
Subject: [Expat-checkins] expat/amiga Makefile, 1.7, 1.8 README.txt, 1.6,
	1.7 expat_68k_handler_stubs.c, 1.1, 1.2 expat_lib.c, 1.5,
	1.6 expat_vectors.c, 1.2, 1.3 stdlib.c, 1.3, 1.4
Message-ID: <E1LTMuG-0003xj-Sc@23jxhf1.ch3.sourceforge.com>

Update of /cvsroot/expat/expat/amiga
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv15220

Modified Files:
	Makefile README.txt expat_68k_handler_stubs.c expat_lib.c 
	expat_vectors.c stdlib.c 
Log Message:
More AmigaOS specific changes.

Index: Makefile
===================================================================
RCS file: /cvsroot/expat/expat/amiga/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile	31 Jan 2009 06:21:09 -0000	1.7
+++ Makefile	31 Jan 2009 20:57:34 -0000	1.8
@@ -19,6 +19,7 @@
 	@echo " all     - make libraries, xmlwf, examples and runs tests"
 	@echo " install - install expat libraries and tools into SDK"
 	@echo " clean   - clean object files"
+	@echo " check   - run all the tests"
 	@echo " package - prepare distribution archive"
 
 all: clib2 newlib library so check
@@ -48,6 +49,8 @@
 	-delete T:expat all force quiet
 	makedir all T:expat/Workbench/Libs
 	copy clone libs/expat.library T:expat/Workbench/Libs
+	makedir all T:expat/Workbench/SObjs
+	copy clone so/libexpat.so T:expat/Workbench/SObjs
 	makedir all T:expat/SDK/Local/C
 	copy clone libs/xmlwf T:expat/SDK/Local/C
 	makedir all T:expat/SDK/Local/clib2/lib
@@ -85,6 +88,7 @@
 
 clib2/libexpat.a: clib2/xmlparse.o clib2/xmltok.o clib2/xmlrole.o
 	$(LIBTOOL) $(LTFLAGS) $@ $^
+	protect $@ -e
 
 clib2/xmlparse.o: xmlparse.c expat.h xmlrole.h xmltok.h \
 	expat_external.h internal.h amigaconfig.h
@@ -148,6 +152,7 @@
 
 newlib/libexpat.a: newlib/xmlparse.o newlib/xmltok.o newlib/xmlrole.o
 	$(LIBTOOL) $(LTFLAGS) $@ $^
+	protect $@ -e
 
 newlib/xmlparse.o: xmlparse.c expat.h xmlrole.h xmltok.h \
 	expat_external.h internal.h amigaconfig.h
@@ -211,6 +216,7 @@
 
 libs/expat.library: libs/expat_lib.o libs/expat_68k.o libs/expat_68k_handler_stubs.o libs/expat_vectors.o libs/stdlib.o newlib/libexpat.a
 	$(CC) -mcrt=newlib -nostartfiles -nostdlib $^ -o $@ newlib/libexpat.a
+	protect $@ -e
 
 libs/expat_lib.o: expat_lib.c
 
@@ -276,6 +282,7 @@
 
 so/libexpat.so: so/xmlparse.o so/xmltok.o so/xmlrole.o
 	$(CC) -mcrt=newlib -shared -o $@ $^
+	protect $@ -e
 
 so/xmlparse.o: xmlparse.c expat.h xmlrole.h xmltok.h \
 	expat_external.h internal.h amigaconfig.h

Index: README.txt
===================================================================
RCS file: /cvsroot/expat/expat/amiga/README.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- README.txt	31 Jan 2009 06:21:09 -0000	1.6
+++ README.txt	31 Jan 2009 20:57:34 -0000	1.7
@@ -39,6 +39,10 @@
 
 HISTORY
 =======
+5.1  - fixed package archive which was missing libexpat.so
+     - fixed library protection bits
+     - fixed up copyright notices
+
 5.0  - integrated 68k patches from Fredrik Wikstrom which means
        expat.library is now callable from 68k code
      - bumped version for the addition of the 68k interface so

Index: expat_68k_handler_stubs.c
===================================================================
RCS file: /cvsroot/expat/expat/amiga/expat_68k_handler_stubs.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- expat_68k_handler_stubs.c	31 Jan 2009 06:21:09 -0000	1.1
+++ expat_68k_handler_stubs.c	31 Jan 2009 20:57:34 -0000	1.2
@@ -1,3 +1,26 @@
+/*
+** Copyright (c) 2001-2009 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 "expat_68k.h"
 #include <exec/emulation.h>
 #include <proto/exec.h>

Index: expat_lib.c
===================================================================
RCS file: /cvsroot/expat/expat/amiga/expat_lib.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- expat_lib.c	31 Jan 2009 06:21:09 -0000	1.5
+++ expat_lib.c	31 Jan 2009 20:57:34 -0000	1.6
@@ -27,8 +27,8 @@
 #define LIBNAME		"expat.library"
 #define LIBPRI		0
 #define VERSION		5
-#define REVISION	0
-#define VSTRING		"expat.library 5.0 (30.1.2009)"  /* dd.mm.yyyy */
+#define REVISION	1
+#define VSTRING		"expat.library 5.1 (31.1.2009)"  /* dd.mm.yyyy */
 
 
 static const char* __attribute__((used)) verstag = "\0$VER: " VSTRING;

Index: expat_vectors.c
===================================================================
RCS file: /cvsroot/expat/expat/amiga/expat_vectors.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- expat_vectors.c	3 Jun 2007 14:54:25 -0000	1.2
+++ expat_vectors.c	31 Jan 2009 20:57:34 -0000	1.3
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2001-2007 Expat maintainers.
+** Copyright (c) 2001-2009 Expat maintainers.
 **
 ** Permission is hereby granted, free of charge, to any person obtaining
 ** a copy of this software and associated documentation files (the
@@ -8,10 +8,10 @@
 ** 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.

Index: stdlib.c
===================================================================
RCS file: /cvsroot/expat/expat/amiga/stdlib.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- stdlib.c	3 Jun 2007 14:55:09 -0000	1.3
+++ stdlib.c	31 Jan 2009 20:57:34 -0000	1.4
@@ -1,5 +1,5 @@
 /*
-** Copyright (c) 2001-2007 Expat maintainers.
+** Copyright (c) 2001-2009 Expat maintainers.
 **
 ** Permission is hereby granted, free of charge, to any person obtaining
 ** a copy of this software and associated documentation files (the
@@ -8,10 +8,10 @@
 ** 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.