expat is now in base, xmlwf in ports

4 files changed, 0 insertions, 818 deletions

diff --git a/lib/expat/amiga/include/inline4/expat.h b/lib/expat/amiga/include/inline4/expat.h
deleted file mode 100644
index 1e3105d94..000000000
--- a/lib/expat/amiga/include/inline4/expat.h
+++ /dev/null
@@ -1,94 +0,0 @@
-#ifndef INLINE4_EXPAT_H
-#define INLINE4_EXPAT_H
-
-/*
-** This file was auto generated by idltool 51.6.
-**
-** It provides compatibility to OS3 style library
-** calls by substituting functions.
-**
-** Do not edit manually.
-*/ 
-
-#ifndef EXEC_TYPES_H
-#include <exec/types.h>
-#endif
-#ifndef EXEC_EXEC_H
-#include <exec/exec.h>
-#endif
-#ifndef EXEC_INTERFACES_H
-#include <exec/interfaces.h>
-#endif
-
-#ifndef LIBRARIES_EXPAT_H
-#include <libraries/expat.h>
-#endif
-
-/* Inline macros for Interface "main" */
-#define XML_ParserCreate(encodingName) IExpat->XML_ParserCreate(encodingName) 
-#define XML_ParserCreateNS(encodingName, nsSep) IExpat->XML_ParserCreateNS(encodingName, nsSep) 
-#define XML_ParserCreate_MM(encoding, memsuite, namespaceSeparator) IExpat->XML_ParserCreate_MM(encoding, memsuite, namespaceSeparator) 
-#define XML_ExternalEntityParserCreate(parser, context, encoding) IExpat->XML_ExternalEntityParserCreate(parser, context, encoding) 
-#define XML_ParserFree(parser) IExpat->XML_ParserFree(parser) 
-#define XML_Parse(parser, s, len, isFinal) IExpat->XML_Parse(parser, s, len, isFinal) 
-#define XML_ParseBuffer(parser, len, isFinal) IExpat->XML_ParseBuffer(parser, len, isFinal) 
-#define XML_GetBuffer(parser, len) IExpat->XML_GetBuffer(parser, len) 
-#define XML_SetStartElementHandler(parser, start) IExpat->XML_SetStartElementHandler(parser, start) 
-#define XML_SetEndElementHandler(parser, end) IExpat->XML_SetEndElementHandler(parser, end) 
-#define XML_SetElementHandler(parser, start, end) IExpat->XML_SetElementHandler(parser, start, end) 
-#define XML_SetCharacterDataHandler(parser, handler) IExpat->XML_SetCharacterDataHandler(parser, handler) 
-#define XML_SetProcessingInstructionHandler(parser, handler) IExpat->XML_SetProcessingInstructionHandler(parser, handler) 
-#define XML_SetCommentHandler(parser, handler) IExpat->XML_SetCommentHandler(parser, handler) 
-#define XML_SetStartCdataSectionHandler(parser, start) IExpat->XML_SetStartCdataSectionHandler(parser, start) 
-#define XML_SetEndCdataSectionHandler(parser, end) IExpat->XML_SetEndCdataSectionHandler(parser, end) 
-#define XML_SetCdataSectionHandler(parser, start, end) IExpat->XML_SetCdataSectionHandler(parser, start, end) 
-#define XML_SetDefaultHandler(parser, handler) IExpat->XML_SetDefaultHandler(parser, handler) 
-#define XML_SetDefaultHandlerExpand(parser, handler) IExpat->XML_SetDefaultHandlerExpand(parser, handler) 
-#define XML_SetExternalEntityRefHandler(parser, handler) IExpat->XML_SetExternalEntityRefHandler(parser, handler) 
-#define XML_SetExternalEntityRefHandlerArg(parser, arg) IExpat->XML_SetExternalEntityRefHandlerArg(parser, arg) 
-#define XML_SetUnknownEncodingHandler(parser, handler, data) IExpat->XML_SetUnknownEncodingHandler(parser, handler, data) 
-#define XML_SetStartNamespaceDeclHandler(parser, start) IExpat->XML_SetStartNamespaceDeclHandler(parser, start) 
-#define XML_SetEndNamespaceDeclHandler(parser, end) IExpat->XML_SetEndNamespaceDeclHandler(parser, end) 
-#define XML_SetNamespaceDeclHandler(parser, start, end) IExpat->XML_SetNamespaceDeclHandler(parser, start, end) 
-#define XML_SetXmlDeclHandler(parser, handler) IExpat->XML_SetXmlDeclHandler(parser, handler) 
-#define XML_SetStartDoctypeDeclHandler(parser, start) IExpat->XML_SetStartDoctypeDeclHandler(parser, start) 
-#define XML_SetEndDoctypeDeclHandler(parser, end) IExpat->XML_SetEndDoctypeDeclHandler(parser, end) 
-#define XML_SetDoctypeDeclHandler(parser, start, end) IExpat->XML_SetDoctypeDeclHandler(parser, start, end) 
-#define XML_SetElementDeclHandler(parser, eldecl) IExpat->XML_SetElementDeclHandler(parser, eldecl) 
-#define XML_SetAttlistDeclHandler(parser, attdecl) IExpat->XML_SetAttlistDeclHandler(parser, attdecl) 
-#define XML_SetEntityDeclHandler(parser, handler) IExpat->XML_SetEntityDeclHandler(parser, handler) 
-#define XML_SetUnparsedEntityDeclHandler(parser, handler) IExpat->XML_SetUnparsedEntityDeclHandler(parser, handler) 
-#define XML_SetNotationDeclHandler(parser, handler) IExpat->XML_SetNotationDeclHandler(parser, handler) 
-#define XML_SetNotStandaloneHandler(parser, handler) IExpat->XML_SetNotStandaloneHandler(parser, handler) 
-#define XML_GetErrorCode(parser) IExpat->XML_GetErrorCode(parser) 
-#define XML_ErrorString(code) IExpat->XML_ErrorString(code) 
-#define XML_GetCurrentByteIndex(parser) IExpat->XML_GetCurrentByteIndex(parser) 
-#define XML_GetCurrentLineNumber(parser) IExpat->XML_GetCurrentLineNumber(parser) 
-#define XML_GetCurrentColumnNumber(parser) IExpat->XML_GetCurrentColumnNumber(parser) 
-#define XML_GetCurrentByteCount(parser) IExpat->XML_GetCurrentByteCount(parser) 
-#define XML_GetInputContext(parser, offset, size) IExpat->XML_GetInputContext(parser, offset, size) 
-#define XML_SetUserData(parser, userData) IExpat->XML_SetUserData(parser, userData) 
-#define XML_DefaultCurrent(parser) IExpat->XML_DefaultCurrent(parser) 
-#define XML_UseParserAsHandlerArg(parser) IExpat->XML_UseParserAsHandlerArg(parser) 
-#define XML_SetBase(parser, base) IExpat->XML_SetBase(parser, base) 
-#define XML_GetBase(parser) IExpat->XML_GetBase(parser) 
-#define XML_GetSpecifiedAttributeCount(parser) IExpat->XML_GetSpecifiedAttributeCount(parser) 
-#define XML_GetIdAttributeIndex(parser) IExpat->XML_GetIdAttributeIndex(parser) 
-#define XML_SetEncoding(parser, encoding) IExpat->XML_SetEncoding(parser, encoding) 
-#define XML_SetParamEntityParsing(parser, parsing) IExpat->XML_SetParamEntityParsing(parser, parsing) 
-#define XML_SetReturnNSTriplet(parser, do_nst) IExpat->XML_SetReturnNSTriplet(parser, do_nst) 
-#define XML_ExpatVersion() IExpat->XML_ExpatVersion() 
-#define XML_ExpatVersionInfo() IExpat->XML_ExpatVersionInfo() 
-#define XML_ParserReset(parser, encoding) IExpat->XML_ParserReset(parser, encoding) 
-#define XML_SetSkippedEntityHandler(parser, handler) IExpat->XML_SetSkippedEntityHandler(parser, handler) 
-#define XML_UseForeignDTD(parser, useDTD) IExpat->XML_UseForeignDTD(parser, useDTD) 
-#define XML_GetFeatureList() IExpat->XML_GetFeatureList() 
-#define XML_StopParser(parser, resumable) IExpat->XML_StopParser(parser, resumable) 
-#define XML_ResumeParser(parser) IExpat->XML_ResumeParser(parser) 
-#define XML_GetParsingStatus(parser, status) IExpat->XML_GetParsingStatus(parser, status) 
-#define XML_FreeContentModel(parser, model) IExpat->XML_FreeContentModel(parser, model) 
-#define XML_MemMalloc(parser, size) IExpat->XML_MemMalloc(parser, size) 
-#define XML_MemRealloc(parser, ptr, size) IExpat->XML_MemRealloc(parser, ptr, size) 
-#define XML_MemFree(parser, ptr) IExpat->XML_MemFree(parser, ptr) 
-
-#endif /* INLINE4_EXPAT_H */
diff --git a/lib/expat/amiga/include/interfaces/expat.h b/lib/expat/amiga/include/interfaces/expat.h
deleted file mode 100644
index e9bdf4aa1..000000000
--- a/lib/expat/amiga/include/interfaces/expat.h
+++ /dev/null
@@ -1,98 +0,0 @@
-#ifndef EXPAT_INTERFACE_DEF_H
-#define EXPAT_INTERFACE_DEF_H
-
-/*
-** This file was machine generated by idltool 51.6.
-** Do not edit
-*/ 
-
-#ifndef EXEC_TYPES_H
-#include <exec/types.h>
-#endif
-#ifndef EXEC_EXEC_H
-#include <exec/exec.h>
-#endif
-#ifndef EXEC_INTERFACES_H
-#include <exec/interfaces.h>
-#endif
-
-#ifndef LIBRARIES_EXPAT_H
-#include <libraries/expat.h>
-#endif
-
-struct ExpatIFace
-{
-	struct InterfaceData Data;
-
-	uint32 APICALL (*Obtain)(struct ExpatIFace *Self);
-	uint32 APICALL (*Release)(struct ExpatIFace *Self);
-	void APICALL (*Expunge)(struct ExpatIFace *Self);
-	struct Interface * APICALL (*Clone)(struct ExpatIFace *Self);
-	XML_Parser APICALL (*XML_ParserCreate)(struct ExpatIFace *Self, const XML_Char * encodingName);
-	XML_Parser APICALL (*XML_ParserCreateNS)(struct ExpatIFace *Self, const XML_Char * encodingName, XML_Char nsSep);
-	XML_Parser APICALL (*XML_ParserCreate_MM)(struct ExpatIFace *Self, const XML_Char * encoding, const XML_Memory_Handling_Suite * memsuite, const XML_Char * namespaceSeparator);
-	XML_Parser APICALL (*XML_ExternalEntityParserCreate)(struct ExpatIFace *Self, XML_Parser parser, const XML_Char * context, const XML_Char * encoding);
-	void APICALL (*XML_ParserFree)(struct ExpatIFace *Self, XML_Parser parser);
-	enum XML_Status APICALL (*XML_Parse)(struct ExpatIFace *Self, XML_Parser parser, const char * s, int len, int isFinal);
-	enum XML_Status APICALL (*XML_ParseBuffer)(struct ExpatIFace *Self, XML_Parser parser, int len, int isFinal);
-	void * APICALL (*XML_GetBuffer)(struct ExpatIFace *Self, XML_Parser parser, int len);
-	void APICALL (*XML_SetStartElementHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_StartElementHandler start);
-	void APICALL (*XML_SetEndElementHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_EndElementHandler end);
-	void APICALL (*XML_SetElementHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_StartElementHandler start, XML_EndElementHandler end);
-	void APICALL (*XML_SetCharacterDataHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_CharacterDataHandler handler);
-	void APICALL (*XML_SetProcessingInstructionHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_ProcessingInstructionHandler handler);
-	void APICALL (*XML_SetCommentHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_CommentHandler handler);
-	void APICALL (*XML_SetStartCdataSectionHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_StartCdataSectionHandler start);
-	void APICALL (*XML_SetEndCdataSectionHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_EndCdataSectionHandler end);
-	void APICALL (*XML_SetCdataSectionHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_StartCdataSectionHandler start, XML_EndCdataSectionHandler end);
-	void APICALL (*XML_SetDefaultHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_DefaultHandler handler);
-	void APICALL (*XML_SetDefaultHandlerExpand)(struct ExpatIFace *Self, XML_Parser parser, XML_DefaultHandler handler);
-	void APICALL (*XML_SetExternalEntityRefHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_ExternalEntityRefHandler handler);
-	void APICALL (*XML_SetExternalEntityRefHandlerArg)(struct ExpatIFace *Self, XML_Parser parser, void * arg);
-	void APICALL (*XML_SetUnknownEncodingHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_UnknownEncodingHandler handler, void * data);
-	void APICALL (*XML_SetStartNamespaceDeclHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_StartNamespaceDeclHandler start);
-	void APICALL (*XML_SetEndNamespaceDeclHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_EndNamespaceDeclHandler end);
-	void APICALL (*XML_SetNamespaceDeclHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_StartNamespaceDeclHandler start, XML_EndNamespaceDeclHandler end);
-	void APICALL (*XML_SetXmlDeclHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_XmlDeclHandler handler);
-	void APICALL (*XML_SetStartDoctypeDeclHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_StartDoctypeDeclHandler start);
-	void APICALL (*XML_SetEndDoctypeDeclHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_EndDoctypeDeclHandler end);
-	void APICALL (*XML_SetDoctypeDeclHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_StartDoctypeDeclHandler start, XML_EndDoctypeDeclHandler end);
-	void APICALL (*XML_SetElementDeclHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_ElementDeclHandler eldecl);
-	void APICALL (*XML_SetAttlistDeclHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_AttlistDeclHandler attdecl);
-	void APICALL (*XML_SetEntityDeclHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_EntityDeclHandler handler);
-	void APICALL (*XML_SetUnparsedEntityDeclHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_UnparsedEntityDeclHandler handler);
-	void APICALL (*XML_SetNotationDeclHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_NotationDeclHandler handler);
-	void APICALL (*XML_SetNotStandaloneHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_NotStandaloneHandler handler);
-	enum XML_Error APICALL (*XML_GetErrorCode)(struct ExpatIFace *Self, XML_Parser parser);
-	const XML_LChar * APICALL (*XML_ErrorString)(struct ExpatIFace *Self, enum XML_Error code);
-	long APICALL (*XML_GetCurrentByteIndex)(struct ExpatIFace *Self, XML_Parser parser);
-	int APICALL (*XML_GetCurrentLineNumber)(struct ExpatIFace *Self, XML_Parser parser);
-	int APICALL (*XML_GetCurrentColumnNumber)(struct ExpatIFace *Self, XML_Parser parser);
-	int APICALL (*XML_GetCurrentByteCount)(struct ExpatIFace *Self, XML_Parser parser);
-	const char * APICALL (*XML_GetInputContext)(struct ExpatIFace *Self, XML_Parser parser, int * offset, int * size);
-	void APICALL (*XML_SetUserData)(struct ExpatIFace *Self, XML_Parser parser, void * userData);
-	void APICALL (*XML_DefaultCurrent)(struct ExpatIFace *Self, XML_Parser parser);
-	void APICALL (*XML_UseParserAsHandlerArg)(struct ExpatIFace *Self, XML_Parser parser);
-	enum XML_Status APICALL (*XML_SetBase)(struct ExpatIFace *Self, XML_Parser parser, const XML_Char * base);
-	const XML_Char * APICALL (*XML_GetBase)(struct ExpatIFace *Self, XML_Parser parser);
-	int APICALL (*XML_GetSpecifiedAttributeCount)(struct ExpatIFace *Self, XML_Parser parser);
-	int APICALL (*XML_GetIdAttributeIndex)(struct ExpatIFace *Self, XML_Parser parser);
-	enum XML_Status APICALL (*XML_SetEncoding)(struct ExpatIFace *Self, XML_Parser parser, const XML_Char * encoding);
-	int APICALL (*XML_SetParamEntityParsing)(struct ExpatIFace *Self, XML_Parser parser, enum XML_ParamEntityParsing parsing);
-	void APICALL (*XML_SetReturnNSTriplet)(struct ExpatIFace *Self, XML_Parser parser, int do_nst);
-	const XML_LChar * APICALL (*XML_ExpatVersion)(struct ExpatIFace *Self);
-	XML_Expat_Version APICALL (*XML_ExpatVersionInfo)(struct ExpatIFace *Self);
-	XML_Bool APICALL (*XML_ParserReset)(struct ExpatIFace *Self, XML_Parser parser, const XML_Char * encoding);
-	void APICALL (*XML_SetSkippedEntityHandler)(struct ExpatIFace *Self, XML_Parser parser, XML_SkippedEntityHandler handler);
-	enum XML_Error APICALL (*XML_UseForeignDTD)(struct ExpatIFace *Self, XML_Parser parser, XML_Bool useDTD);
-	const XML_Feature * APICALL (*XML_GetFeatureList)(struct ExpatIFace *Self);
-	enum XML_Status APICALL (*XML_StopParser)(struct ExpatIFace *Self, XML_Parser parser, XML_Bool resumable);
-	enum XML_Status APICALL (*XML_ResumeParser)(struct ExpatIFace *Self, XML_Parser parser);
-	void APICALL (*XML_GetParsingStatus)(struct ExpatIFace *Self, XML_Parser parser, XML_ParsingStatus * status);
-	void APICALL (*XML_FreeContentModel)(struct ExpatIFace *Self, XML_Parser parser, XML_Content * model);
-	void * APICALL (*XML_MemMalloc)(struct ExpatIFace *Self, XML_Parser parser, size_t size);
-	void * APICALL (*XML_MemRealloc)(struct ExpatIFace *Self, XML_Parser parser, void * ptr, size_t size);
-	void APICALL (*XML_MemFree)(struct ExpatIFace *Self, XML_Parser parser, void * ptr);
-};
-
-#endif /* EXPAT_INTERFACE_DEF_H */
diff --git a/lib/expat/amiga/include/libraries/expat.h b/lib/expat/amiga/include/libraries/expat.h
deleted file mode 100644
index cdd211e13..000000000
--- a/lib/expat/amiga/include/libraries/expat.h
+++ /dev/null
@@ -1,564 +0,0 @@
-#ifndef LIBRARIES_EXPAT_H
-#define LIBRARIES_EXPAT_H
-
-/*
-** Copyright (c) 2001-2005 Expat maintainers.
-**
-** Permission is hereby granted, free of charge, to any person obtaining
-** a copy of this software and associated documentation files (the
-** "Software"), to deal in the Software without restriction, including
-** without limitation the rights to use, copy, modify, merge, publish,
-** distribute, sublicense, and/or sell copies of the Software, and to
-** permit persons to whom the Software is furnished to do so, subject to
-** the following conditions:
-** 
-** The above copyright notice and this permission notice shall be included
-** in all copies or substantial portions of the Software.
-** 
-** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-** SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-
-/****************************************************************************/
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __GNUC__
-   #ifdef __PPC__
-    #pragma pack(2)
-   #endif
-#elif defined(__VBCC__)
-   #pragma amiga-align
-#endif
-
-/****************************************************************************/
-
-
-#include <stdlib.h>
-
-#ifndef XMLCALL
-#define XMLCALL
-#endif
-
-typedef char XML_Char;
-typedef char XML_LChar;
-typedef long XML_Index;
-typedef unsigned long XML_Size;
-
-struct XML_ParserStruct;
-typedef struct XML_ParserStruct *XML_Parser;
-
-typedef unsigned char XML_Bool;
-#define XML_TRUE   ((XML_Bool) 1)
-#define XML_FALSE  ((XML_Bool) 0)
-
-enum XML_Status {
-  XML_STATUS_ERROR = 0,
-#define XML_STATUS_ERROR XML_STATUS_ERROR
-  XML_STATUS_OK = 1,
-#define XML_STATUS_OK XML_STATUS_OK
-  XML_STATUS_SUSPENDED = 2,
-#define XML_STATUS_SUSPENDED XML_STATUS_SUSPENDED
-};
-
-enum XML_Error {
-  XML_ERROR_NONE,
-  XML_ERROR_NO_MEMORY,
-  XML_ERROR_SYNTAX,
-  XML_ERROR_NO_ELEMENTS,
-  XML_ERROR_INVALID_TOKEN,
-  XML_ERROR_UNCLOSED_TOKEN,
-  XML_ERROR_PARTIAL_CHAR,
-  XML_ERROR_TAG_MISMATCH,
-  XML_ERROR_DUPLICATE_ATTRIBUTE,
-  XML_ERROR_JUNK_AFTER_DOC_ELEMENT,
-  XML_ERROR_PARAM_ENTITY_REF,
-  XML_ERROR_UNDEFINED_ENTITY,
-  XML_ERROR_RECURSIVE_ENTITY_REF,
-  XML_ERROR_ASYNC_ENTITY,
-  XML_ERROR_BAD_CHAR_REF,
-  XML_ERROR_BINARY_ENTITY_REF,
-  XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF,
-  XML_ERROR_MISPLACED_XML_PI,
-  XML_ERROR_UNKNOWN_ENCODING,
-  XML_ERROR_INCORRECT_ENCODING,
-  XML_ERROR_UNCLOSED_CDATA_SECTION,
-  XML_ERROR_EXTERNAL_ENTITY_HANDLING,
-  XML_ERROR_NOT_STANDALONE,
-  XML_ERROR_UNEXPECTED_STATE,
-  XML_ERROR_ENTITY_DECLARED_IN_PE,
-  XML_ERROR_FEATURE_REQUIRES_XML_DTD,
-  XML_ERROR_CANT_CHANGE_FEATURE_ONCE_PARSING,
-  XML_ERROR_UNBOUND_PREFIX,
-  XML_ERROR_UNDECLARING_PREFIX,
-  XML_ERROR_INCOMPLETE_PE,
-  XML_ERROR_XML_DECL,
-  XML_ERROR_TEXT_DECL,
-  XML_ERROR_PUBLICID,
-  XML_ERROR_SUSPENDED,
-  XML_ERROR_NOT_SUSPENDED,
-  XML_ERROR_ABORTED,
-  XML_ERROR_FINISHED,
-  XML_ERROR_SUSPEND_PE,
-  XML_ERROR_RESERVED_PREFIX_XML,
-  XML_ERROR_RESERVED_PREFIX_XMLNS,
-  XML_ERROR_RESERVED_NAMESPACE_URI
-};
-
-enum XML_Content_Type {
-  XML_CTYPE_EMPTY = 1,
-  XML_CTYPE_ANY,
-  XML_CTYPE_MIXED,
-  XML_CTYPE_NAME,
-  XML_CTYPE_CHOICE,
-  XML_CTYPE_SEQ
-};
-
-enum XML_Content_Quant {
-  XML_CQUANT_NONE,
-  XML_CQUANT_OPT,
-  XML_CQUANT_REP,
-  XML_CQUANT_PLUS
-};
-
-typedef struct XML_cp XML_Content;
-
-struct XML_cp {
-  enum XML_Content_Type         type;
-  enum XML_Content_Quant        quant;
-  XML_Char *                    name;
-  unsigned int                  numchildren;
-  XML_Content *                 children;
-};
-
-
-typedef void (*XML_ElementDeclHandler) (void *userData,
-                                        const XML_Char *name,
-                                        XML_Content *model);
-
-void
-XML_SetElementDeclHandler(XML_Parser parser,
-                          XML_ElementDeclHandler eldecl);
-
-typedef void (*XML_AttlistDeclHandler) (
-                                    void            *userData,
-                                    const XML_Char  *elname,
-                                    const XML_Char  *attname,
-                                    const XML_Char  *att_type,
-                                    const XML_Char  *dflt,
-                                    int              isrequired);
-
-void
-XML_SetAttlistDeclHandler(XML_Parser parser,
-                          XML_AttlistDeclHandler attdecl);
-
-typedef void (*XML_XmlDeclHandler) (void *userData,
-                                    const XML_Char *version,
-                                    const XML_Char *encoding,
-                                    int             standalone);
-
-void
-XML_SetXmlDeclHandler(XML_Parser parser,
-                      XML_XmlDeclHandler xmldecl);
-
-
-typedef struct {
-  void *(*malloc_fcn)(size_t size);
-  void *(*realloc_fcn)(void *ptr, size_t size);
-  void (*free_fcn)(void *ptr);
-} XML_Memory_Handling_Suite;
-
-XML_Parser
-XML_ParserCreate(const XML_Char *encoding);
-
-XML_Parser
-XML_ParserCreateNS(const XML_Char *encoding, XML_Char namespaceSeparator);
-
-
-XML_Parser
-XML_ParserCreate_MM(const XML_Char *encoding,
-                    const XML_Memory_Handling_Suite *memsuite,
-                    const XML_Char *namespaceSeparator);
-
-XML_Bool
-XML_ParserReset(XML_Parser parser, const XML_Char *encoding);
-
-typedef void (*XML_StartElementHandler) (void *userData,
-                                         const XML_Char *name,
-                                         const XML_Char **atts);
-
-typedef void (*XML_EndElementHandler) (void *userData,
-                                       const XML_Char *name);
-
-
-typedef void (*XML_CharacterDataHandler) (void *userData,
-                                          const XML_Char *s,
-                                          int len);
-
-typedef void (*XML_ProcessingInstructionHandler) (
-                                                void *userData,
-                                                const XML_Char *target,
-                                                const XML_Char *data);
-
-typedef void (*XML_CommentHandler) (void *userData,
-                                    const XML_Char *data);
-
-typedef void (*XML_StartCdataSectionHandler) (void *userData);
-typedef void (*XML_EndCdataSectionHandler) (void *userData);
-
-typedef void (*XML_DefaultHandler) (void *userData,
-                                    const XML_Char *s,
-                                    int len);
-
-typedef void (*XML_StartDoctypeDeclHandler) (
-                                            void *userData,
-                                            const XML_Char *doctypeName,
-                                            const XML_Char *sysid,
-                                            const XML_Char *pubid,
-                                            int has_internal_subset);
-
-typedef void (*XML_EndDoctypeDeclHandler)(void *userData);
-
-typedef void (*XML_EntityDeclHandler) (
-                              void *userData,
-                              const XML_Char *entityName,
-                              int is_parameter_entity,
-                              const XML_Char *value,
-                              int value_length,
-                              const XML_Char *base,
-                              const XML_Char *systemId,
-                              const XML_Char *publicId,
-                              const XML_Char *notationName);
-
-void
-XML_SetEntityDeclHandler(XML_Parser parser,
-                         XML_EntityDeclHandler handler);
-
-typedef void (*XML_UnparsedEntityDeclHandler) (
-                                    void *userData,
-                                    const XML_Char *entityName,
-                                    const XML_Char *base,
-                                    const XML_Char *systemId,
-                                    const XML_Char *publicId,
-                                    const XML_Char *notationName);
-
-typedef void (*XML_NotationDeclHandler) (
-                                    void *userData,
-                                    const XML_Char *notationName,
-                                    const XML_Char *base,
-                                    const XML_Char *systemId,
-                                    const XML_Char *publicId);
-
-typedef void (*XML_StartNamespaceDeclHandler) (
-                                    void *userData,
-                                    const XML_Char *prefix,
-                                    const XML_Char *uri);
-
-typedef void (*XML_EndNamespaceDeclHandler) (
-                                    void *userData,
-                                    const XML_Char *prefix);
-
-typedef int (*XML_NotStandaloneHandler) (void *userData);
-
-typedef int (*XML_ExternalEntityRefHandler) (
-                                    XML_Parser parser,
-                                    const XML_Char *context,
-                                    const XML_Char *base,
-                                    const XML_Char *systemId,
-                                    const XML_Char *publicId);
-
-typedef void (*XML_SkippedEntityHandler) (
-                                    void *userData,
-                                    const XML_Char *entityName,
-                                    int is_parameter_entity);
-
-typedef struct {
-  int map[256];
-  void *data;
-  int (*convert)(void *data, const char *s);
-  void (*release)(void *data);
-} XML_Encoding;
-
-typedef int (*XML_UnknownEncodingHandler) (
-                                    void *encodingHandlerData,
-                                    const XML_Char *name,
-                                    XML_Encoding *info);
-
-void
-XML_SetElementHandler(XML_Parser parser,
-                      XML_StartElementHandler start,
-                      XML_EndElementHandler end);
-
-void
-XML_SetStartElementHandler(XML_Parser parser,
-                           XML_StartElementHandler handler);
-
-void
-XML_SetEndElementHandler(XML_Parser parser,
-                         XML_EndElementHandler handler);
-
-void
-XML_SetCharacterDataHandler(XML_Parser parser,
-                            XML_CharacterDataHandler handler);
-
-void
-XML_SetProcessingInstructionHandler(XML_Parser parser,
-                                    XML_ProcessingInstructionHandler handler);
-void
-XML_SetCommentHandler(XML_Parser parser,
-                      XML_CommentHandler handler);
-
-void
-XML_SetCdataSectionHandler(XML_Parser parser,
-                           XML_StartCdataSectionHandler start,
-                           XML_EndCdataSectionHandler end);
-
-void
-XML_SetStartCdataSectionHandler(XML_Parser parser,
-                                XML_StartCdataSectionHandler start);
-
-void
-XML_SetEndCdataSectionHandler(XML_Parser parser,
-                              XML_EndCdataSectionHandler end);
-
-void
-XML_SetDefaultHandler(XML_Parser parser,
-                      XML_DefaultHandler handler);
-
-void
-XML_SetDefaultHandlerExpand(XML_Parser parser,
-                            XML_DefaultHandler handler);
-
-void
-XML_SetDoctypeDeclHandler(XML_Parser parser,
-                          XML_StartDoctypeDeclHandler start,
-                          XML_EndDoctypeDeclHandler end);
-
-void
-XML_SetStartDoctypeDeclHandler(XML_Parser parser,
-                               XML_StartDoctypeDeclHandler start);
-
-void
-XML_SetEndDoctypeDeclHandler(XML_Parser parser,
-                             XML_EndDoctypeDeclHandler end);
-
-void
-XML_SetUnparsedEntityDeclHandler(XML_Parser parser,
-                                 XML_UnparsedEntityDeclHandler handler);
-
-void
-XML_SetNotationDeclHandler(XML_Parser parser,
-                           XML_NotationDeclHandler handler);
-
-void
-XML_SetNamespaceDeclHandler(XML_Parser parser,
-                            XML_StartNamespaceDeclHandler start,
-                            XML_EndNamespaceDeclHandler end);
-
-void
-XML_SetStartNamespaceDeclHandler(XML_Parser parser,
-                                 XML_StartNamespaceDeclHandler start);
-
-void
-XML_SetEndNamespaceDeclHandler(XML_Parser parser,
-                               XML_EndNamespaceDeclHandler end);
-
-void
-XML_SetNotStandaloneHandler(XML_Parser parser,
-                            XML_NotStandaloneHandler handler);
-
-void
-XML_SetExternalEntityRefHandler(XML_Parser parser,
-                                XML_ExternalEntityRefHandler handler);
-
-void
-XML_SetExternalEntityRefHandlerArg(XML_Parser parser,
-                                   void *arg);
-
-void
-XML_SetSkippedEntityHandler(XML_Parser parser,
-                            XML_SkippedEntityHandler handler);
-
-void
-XML_SetUnknownEncodingHandler(XML_Parser parser,
-                              XML_UnknownEncodingHandler handler,
-                              void *encodingHandlerData);
-
-void
-XML_DefaultCurrent(XML_Parser parser);
-
-void
-XML_SetReturnNSTriplet(XML_Parser parser, int do_nst);
-
-void
-XML_SetUserData(XML_Parser parser, void *userData);
-
-#define XML_GetUserData(parser) (*(void **)(parser))
-
-enum XML_Status
-XML_SetEncoding(XML_Parser parser, const XML_Char *encoding);
-
-void
-XML_UseParserAsHandlerArg(XML_Parser parser);
-
-enum XML_Error
-XML_UseForeignDTD(XML_Parser parser, XML_Bool useDTD);
-
-
-enum XML_Status
-XML_SetBase(XML_Parser parser, const XML_Char *base);
-
-const XML_Char *
-XML_GetBase(XML_Parser parser);
-
-int
-XML_GetSpecifiedAttributeCount(XML_Parser parser);
-
-int
-XML_GetIdAttributeIndex(XML_Parser parser);
-
-enum XML_Status
-XML_Parse(XML_Parser parser, const char *s, int len, int isFinal);
-
-void *
-XML_GetBuffer(XML_Parser parser, int len);
-
-enum XML_Status
-XML_ParseBuffer(XML_Parser parser, int len, int isFinal);
-
-enum XML_Status
-XML_StopParser(XML_Parser parser, XML_Bool resumable);
-
-enum XML_Status
-XML_ResumeParser(XML_Parser parser);
-
-enum XML_Parsing {
-  XML_INITIALIZED,
-  XML_PARSING,
-  XML_FINISHED,
-  XML_SUSPENDED
-};
-
-typedef struct {
-  enum XML_Parsing parsing;
-  XML_Bool finalBuffer;
-} XML_ParsingStatus;
-
-void
-XML_GetParsingStatus(XML_Parser parser, XML_ParsingStatus *status);
-
-XML_Parser
-XML_ExternalEntityParserCreate(XML_Parser parser,
-                               const XML_Char *context,
-                               const XML_Char *encoding);
-
-enum XML_ParamEntityParsing {
-  XML_PARAM_ENTITY_PARSING_NEVER,
-  XML_PARAM_ENTITY_PARSING_UNLESS_STANDALONE,
-  XML_PARAM_ENTITY_PARSING_ALWAYS
-};
-
-int
-XML_SetParamEntityParsing(XML_Parser parser,
-                          enum XML_ParamEntityParsing parsing);
-
-enum XML_Error
-XML_GetErrorCode(XML_Parser parser);
-
-int XML_GetCurrentLineNumber(XML_Parser parser);
-int XML_GetCurrentColumnNumber(XML_Parser parser);
-long XML_GetCurrentByteIndex(XML_Parser parser);
-
-int
-XML_GetCurrentByteCount(XML_Parser parser);
-
-const char *
-XML_GetInputContext(XML_Parser parser,
-                    int *offset,
-                    int *size);
-
-#define XML_GetErrorLineNumber   XML_GetCurrentLineNumber
-#define XML_GetErrorColumnNumber XML_GetCurrentColumnNumber
-#define XML_GetErrorByteIndex    XML_GetCurrentByteIndex
-
-void
-XML_FreeContentModel(XML_Parser parser, XML_Content *model);
-
-void *
-XML_MemMalloc(XML_Parser parser, size_t size);
-
-void *
-XML_MemRealloc(XML_Parser parser, void *ptr, size_t size);
-
-void
-XML_MemFree(XML_Parser parser, void *ptr);
-
-void
-XML_ParserFree(XML_Parser parser);
-
-const XML_LChar *
-XML_ErrorString(enum XML_Error code);
-
-const XML_LChar *
-XML_ExpatVersion(void);
-
-typedef struct {
-  int major;
-  int minor;
-  int micro;
-} XML_Expat_Version;
-
-XML_Expat_Version 
-XML_ExpatVersionInfo(void);
-
-enum XML_FeatureEnum {
-  XML_FEATURE_END = 0,
-  XML_FEATURE_UNICODE,
-  XML_FEATURE_UNICODE_WCHAR_T,
-  XML_FEATURE_DTD,
-  XML_FEATURE_CONTEXT_BYTES,
-  XML_FEATURE_MIN_SIZE,
-  XML_FEATURE_SIZEOF_XML_CHAR,
-  XML_FEATURE_SIZEOF_XML_LCHAR
-};
-
-typedef struct {
-  enum XML_FeatureEnum  feature;
-  const XML_LChar       *name;
-  long int              value;
-} XML_Feature;
-
-const XML_Feature *
-XML_GetFeatureList(void);
-
-
-#define XML_MAJOR_VERSION 2
-#define XML_MINOR_VERSION 0
-#define XML_MICRO_VERSION 0
-
-
-/****************************************************************************/
-
-#ifdef __GNUC__
-   #ifdef __PPC__
-    #pragma pack()
-   #endif
-#elif defined(__VBCC__)
-   #pragma default-align
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-/****************************************************************************/
-
-#endif  /* EXPAT_EXPAT_H */
diff --git a/lib/expat/amiga/include/proto/expat.h b/lib/expat/amiga/include/proto/expat.h
deleted file mode 100644
index 02df6c39f..000000000
--- a/lib/expat/amiga/include/proto/expat.h
+++ /dev/null
@@ -1,62 +0,0 @@
-#ifndef PROTO_EXPAT_H
-#define PROTO_EXPAT_H
-
-/*
-**	$Id: expat.h,v 1.1 2006/11/25 18:35:43 matthieu Exp $
-**	Includes Release 50.1
-**
-**	Prototype/inline/pragma header file combo
-**
-**	(C) Copyright 2003-2005 Amiga, Inc.
-**	    All Rights Reserved
-*/
-
-#ifndef LIBRARIES_EXPAT_H
-#include <libraries/expat.h>
-#endif
-
-/****************************************************************************/
-
-#ifndef __NOLIBBASE__
- #ifndef __USE_BASETYPE__
-  extern struct Library * ExpatBase;
- #else
-  extern struct Library * ExpatBase;
- #endif /* __USE_BASETYPE__ */
-#endif /* __NOLIBBASE__ */
-
-/****************************************************************************/
-
-#ifdef __amigaos4__
- #include <interfaces/expat.h>
- #ifdef __USE_INLINE__
-  #include <inline4/expat.h>
- #endif /* __USE_INLINE__ */
- #ifndef CLIB_EXPAT_PROTOS_H
-  #define CLIB_EXPAT_PROTOS_H 1
- #endif /* CLIB_EXPAT_PROTOS_H */
- #ifndef __NOGLOBALIFACE__
-  extern struct ExpatIFace *IExpat;
- #endif /* __NOGLOBALIFACE__ */
-#else /* __amigaos4__ */
- #ifndef CLIB_EXPAT_PROTOS_H
-  #include <clib/expat_protos.h>
- #endif /* CLIB_EXPAT_PROTOS_H */
- #if defined(__GNUC__)
-  #ifndef __PPC__
-   #include <inline/expat.h>
-  #else
-   #include <ppcinline/expat.h>
-  #endif /* __PPC__ */
- #elif defined(__VBCC__)
-  #ifndef __PPC__
-   #include <inline/expat_protos.h>
-  #endif /* __PPC__ */
- #else
-  #include <pragmas/expat_pragmas.h>
- #endif /* __GNUC__ */
-#endif /* __amigaos4__ */
-
-/****************************************************************************/
-
-#endif /* PROTO_EXPAT_H */