[Expat-checkins] CVS: expat/lib expat.h.in,1.4,1.5
Fred L. Drake
fdrake@users.sourceforge.net
Tue, 24 Jul 2001 09:00:54 -0700
Update of /cvsroot/expat/expat/lib
In directory usw-pr-cvs1:/tmp/cvs-serv15460
Modified Files:
expat.h.in
Log Message:
The previous checkin of expat.h.in broke the build for Windows (now everyone
will just have to wonder how I got anything at all working on Windows).
Since we do not want to place the XMLPARSEAPI marker in the middle of a
type name, always tack it onto the beginning -- anywhere else seems fragile
at best.
Index: expat.h.in
===================================================================
RCS file: /cvsroot/expat/expat/lib/expat.h.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** expat.h.in 2001/07/21 02:28:28 1.4
--- expat.h.in 2001/07/24 16:00:52 1.5
***************
*** 81,85 ****
XML_Content *model);
! void XMLPARSEAPI
XML_SetElementDeclHandler(XML_Parser parser,
XML_ElementDeclHandler eldecl);
--- 81,85 ----
XML_Content *model);
! XMLPARSEAPI void
XML_SetElementDeclHandler(XML_Parser parser,
XML_ElementDeclHandler eldecl);
***************
*** 102,106 ****
int isrequired);
! void XMLPARSEAPI
XML_SetAttlistDeclHandler(XML_Parser parser,
XML_AttlistDeclHandler attdecl);
--- 102,106 ----
int isrequired);
! XMLPARSEAPI void
XML_SetAttlistDeclHandler(XML_Parser parser,
XML_AttlistDeclHandler attdecl);
***************
*** 120,124 ****
int standalone);
! void XMLPARSEAPI
XML_SetXmlDeclHandler(XML_Parser parser,
XML_XmlDeclHandler xmldecl);
--- 120,124 ----
int standalone);
! XMLPARSEAPI void
XML_SetXmlDeclHandler(XML_Parser parser,
XML_XmlDeclHandler xmldecl);
***************
*** 134,138 ****
external protocol or null if there is none specified. */
! XML_Parser XMLPARSEAPI
XML_ParserCreate(const XML_Char *encoding);
--- 134,138 ----
external protocol or null if there is none specified. */
! XMLPARSEAPI XML_Parser
XML_ParserCreate(const XML_Char *encoding);
***************
*** 147,151 ****
the name and prefix will be passed through without expansion. */
! XML_Parser XMLPARSEAPI
XML_ParserCreateNS(const XML_Char *encoding, XML_Char namespaceSeparator);
--- 147,151 ----
the name and prefix will be passed through without expansion. */
! XMLPARSEAPI XML_Parser
XML_ParserCreateNS(const XML_Char *encoding, XML_Char namespaceSeparator);
***************
*** 161,165 ****
*/
! XML_Parser XMLPARSEAPI
XML_ParserCreate_MM(const XML_Char *encoding,
const XML_Memory_Handling_Suite *memsuite,
--- 161,165 ----
*/
! XMLPARSEAPI XML_Parser
XML_ParserCreate_MM(const XML_Char *encoding,
const XML_Memory_Handling_Suite *memsuite,
***************
*** 250,254 ****
const XML_Char *notationName);
! void XMLPARSEAPI
XML_SetEntityDeclHandler(XML_Parser parser,
XML_EntityDeclHandler handler);
--- 250,254 ----
const XML_Char *notationName);
! XMLPARSEAPI void
XML_SetEntityDeclHandler(XML_Parser parser,
XML_EntityDeclHandler handler);
***************
*** 331,334 ****
--- 331,339 ----
const XML_Char *publicId);
+ typedef int (*XML_InternalEntityRefHandler)(XML_Parser parser,
+ const XML_Char *context,
+ const XML_Char *name,
+ const XML_Char *text);
+
/* This structure is filled in by the XML_UnknownEncodingHandler
to provide information to the parser about encodings that are unknown
***************
*** 395,430 ****
XML_Encoding *info);
! void XMLPARSEAPI
XML_SetElementHandler(XML_Parser parser,
XML_StartElementHandler start,
XML_EndElementHandler end);
! void XMLPARSEAPI
XML_SetStartElementHandler(XML_Parser, XML_StartElementHandler);
! void XMLPARSEAPI
XML_SetEndElementHandler(XML_Parser, XML_EndElementHandler);
! void XMLPARSEAPI
XML_SetCharacterDataHandler(XML_Parser parser,
XML_CharacterDataHandler handler);
! void XMLPARSEAPI
XML_SetProcessingInstructionHandler(XML_Parser parser,
XML_ProcessingInstructionHandler handler);
! void XMLPARSEAPI
XML_SetCommentHandler(XML_Parser parser,
XML_CommentHandler handler);
! void XMLPARSEAPI
XML_SetCdataSectionHandler(XML_Parser parser,
XML_StartCdataSectionHandler start,
XML_EndCdataSectionHandler end);
! void XMLPARSEAPI
XML_SetStartCdataSectionHandler(XML_Parser parser,
XML_StartCdataSectionHandler start);
! void XMLPARSEAPI
XML_SetEndCdataSectionHandler(XML_Parser parser,
XML_EndCdataSectionHandler end);
--- 400,435 ----
XML_Encoding *info);
! XMLPARSEAPI void
XML_SetElementHandler(XML_Parser parser,
XML_StartElementHandler start,
XML_EndElementHandler end);
! XMLPARSEAPI void
XML_SetStartElementHandler(XML_Parser, XML_StartElementHandler);
! XMLPARSEAPI void
XML_SetEndElementHandler(XML_Parser, XML_EndElementHandler);
! XMLPARSEAPI void
XML_SetCharacterDataHandler(XML_Parser parser,
XML_CharacterDataHandler handler);
! XMLPARSEAPI void
XML_SetProcessingInstructionHandler(XML_Parser parser,
XML_ProcessingInstructionHandler handler);
! XMLPARSEAPI void
XML_SetCommentHandler(XML_Parser parser,
XML_CommentHandler handler);
! XMLPARSEAPI void
XML_SetCdataSectionHandler(XML_Parser parser,
XML_StartCdataSectionHandler start,
XML_EndCdataSectionHandler end);
! XMLPARSEAPI void
XML_SetStartCdataSectionHandler(XML_Parser parser,
XML_StartCdataSectionHandler start);
! XMLPARSEAPI void
XML_SetEndCdataSectionHandler(XML_Parser parser,
XML_EndCdataSectionHandler end);
***************
*** 434,438 ****
handler. */
! void XMLPARSEAPI
XML_SetDefaultHandler(XML_Parser parser,
XML_DefaultHandler handler);
--- 439,443 ----
handler. */
! XMLPARSEAPI void
XML_SetDefaultHandler(XML_Parser parser,
XML_DefaultHandler handler);
***************
*** 442,488 ****
default handler. */
! void XMLPARSEAPI
XML_SetDefaultHandlerExpand(XML_Parser parser,
XML_DefaultHandler handler);
! void XMLPARSEAPI
XML_SetDoctypeDeclHandler(XML_Parser parser,
XML_StartDoctypeDeclHandler start,
XML_EndDoctypeDeclHandler end);
! void XMLPARSEAPI
XML_SetStartDoctypeDeclHandler(XML_Parser parser,
XML_StartDoctypeDeclHandler start);
! void XMLPARSEAPI
XML_SetEndDoctypeDeclHandler(XML_Parser parser,
XML_EndDoctypeDeclHandler end);
! void XMLPARSEAPI
XML_SetUnparsedEntityDeclHandler(XML_Parser parser,
XML_UnparsedEntityDeclHandler handler);
! void XMLPARSEAPI
XML_SetNotationDeclHandler(XML_Parser parser,
XML_NotationDeclHandler handler);
! void XMLPARSEAPI
XML_SetNamespaceDeclHandler(XML_Parser parser,
XML_StartNamespaceDeclHandler start,
XML_EndNamespaceDeclHandler end);
! void XMLPARSEAPI
XML_SetStartNamespaceDeclHandler(XML_Parser parser,
XML_StartNamespaceDeclHandler start);
! void XMLPARSEAPI
XML_SetEndNamespaceDeclHandler(XML_Parser parser,
XML_EndNamespaceDeclHandler end);
! void XMLPARSEAPI
XML_SetNotStandaloneHandler(XML_Parser parser,
XML_NotStandaloneHandler handler);
! void XMLPARSEAPI
XML_SetExternalEntityRefHandler(XML_Parser parser,
XML_ExternalEntityRefHandler handler);
--- 447,493 ----
default handler. */
! XMLPARSEAPI void
XML_SetDefaultHandlerExpand(XML_Parser parser,
XML_DefaultHandler handler);
! XMLPARSEAPI void
XML_SetDoctypeDeclHandler(XML_Parser parser,
XML_StartDoctypeDeclHandler start,
XML_EndDoctypeDeclHandler end);
! XMLPARSEAPI void
XML_SetStartDoctypeDeclHandler(XML_Parser parser,
XML_StartDoctypeDeclHandler start);
! XMLPARSEAPI void
XML_SetEndDoctypeDeclHandler(XML_Parser parser,
XML_EndDoctypeDeclHandler end);
! XMLPARSEAPI void
XML_SetUnparsedEntityDeclHandler(XML_Parser parser,
XML_UnparsedEntityDeclHandler handler);
! XMLPARSEAPI void
XML_SetNotationDeclHandler(XML_Parser parser,
XML_NotationDeclHandler handler);
! XMLPARSEAPI void
XML_SetNamespaceDeclHandler(XML_Parser parser,
XML_StartNamespaceDeclHandler start,
XML_EndNamespaceDeclHandler end);
! XMLPARSEAPI void
XML_SetStartNamespaceDeclHandler(XML_Parser parser,
XML_StartNamespaceDeclHandler start);
! XMLPARSEAPI void
XML_SetEndNamespaceDeclHandler(XML_Parser parser,
XML_EndNamespaceDeclHandler end);
! XMLPARSEAPI void
XML_SetNotStandaloneHandler(XML_Parser parser,
XML_NotStandaloneHandler handler);
! XMLPARSEAPI void
XML_SetExternalEntityRefHandler(XML_Parser parser,
XML_ExternalEntityRefHandler handler);
***************
*** 491,498 ****
as the first argument to the external entity ref handler instead
of the parser object. */
! void XMLPARSEAPI
XML_SetExternalEntityRefHandlerArg(XML_Parser, void *arg);
! void XMLPARSEAPI
XML_SetUnknownEncodingHandler(XML_Parser parser,
XML_UnknownEncodingHandler handler,
--- 496,503 ----
as the first argument to the external entity ref handler instead
of the parser object. */
! XMLPARSEAPI void
XML_SetExternalEntityRefHandlerArg(XML_Parser, void *arg);
! XMLPARSEAPI void
XML_SetUnknownEncodingHandler(XML_Parser parser,
XML_UnknownEncodingHandler handler,
***************
*** 502,506 ****
processing instruction or character data. It causes the corresponding
markup to be passed to the default handler. */
! void XMLPARSEAPI
XML_DefaultCurrent(XML_Parser parser);
--- 507,511 ----
processing instruction or character data. It causes the corresponding
markup to be passed to the default handler. */
! XMLPARSEAPI void
XML_DefaultCurrent(XML_Parser parser);
***************
*** 516,524 ****
*/
! void XMLPARSEAPI
XML_SetReturnNSTriplet(XML_Parser parser, int do_nst);
/* This value is passed as the userData argument to callbacks. */
! void XMLPARSEAPI
XML_SetUserData(XML_Parser parser, void *userData);
--- 521,529 ----
*/
! XMLPARSEAPI void
XML_SetReturnNSTriplet(XML_Parser parser, int do_nst);
/* This value is passed as the userData argument to callbacks. */
! XMLPARSEAPI void
XML_SetUserData(XML_Parser parser, void *userData);
***************
*** 530,534 ****
or XML_ParseBuffer. */
! int XMLPARSEAPI
XML_SetEncoding(XML_Parser parser, const XML_Char *encoding);
--- 535,539 ----
or XML_ParseBuffer. */
! XMLPARSEAPI int
XML_SetEncoding(XML_Parser parser, const XML_Char *encoding);
***************
*** 547,554 ****
Returns zero if out of memory, non-zero otherwise. */
! int XMLPARSEAPI
XML_SetBase(XML_Parser parser, const XML_Char *base);
! const XML_Char * XMLPARSEAPI
XML_GetBase(XML_Parser parser);
--- 552,559 ----
Returns zero if out of memory, non-zero otherwise. */
! XMLPARSEAPI int
XML_SetBase(XML_Parser parser, const XML_Char *base);
! XMLPARSEAPI const XML_Char *
XML_GetBase(XML_Parser parser);
***************
*** 559,563 ****
XML_StartElementHandler. */
! int XMLPARSEAPI
XML_GetSpecifiedAttributeCount(XML_Parser parser);
--- 564,568 ----
XML_StartElementHandler. */
! XMLPARSEAPI int
XML_GetSpecifiedAttributeCount(XML_Parser parser);
***************
*** 567,571 ****
into the atts array passed to the XML_StartElementHandler. */
! int XMLPARSEAPI
XML_GetIdAttributeIndex(XML_Parser parser);
--- 572,576 ----
into the atts array passed to the XML_StartElementHandler. */
! XMLPARSEAPI int
XML_GetIdAttributeIndex(XML_Parser parser);
***************
*** 573,583 ****
The last call to XML_Parse must have isFinal true;
len may be zero for this call (or any other). */
! int XMLPARSEAPI
XML_Parse(XML_Parser parser, const char *s, int len, int isFinal);
! void * XMLPARSEAPI
XML_GetBuffer(XML_Parser parser, int len);
! int XMLPARSEAPI
XML_ParseBuffer(XML_Parser parser, int len, int isFinal);
--- 578,588 ----
The last call to XML_Parse must have isFinal true;
len may be zero for this call (or any other). */
! XMLPARSEAPI int
XML_Parse(XML_Parser parser, const char *s, int len, int isFinal);
! XMLPARSEAPI void *
XML_GetBuffer(XML_Parser parser, int len);
! XMLPARSEAPI int
XML_ParseBuffer(XML_Parser parser, int len, int isFinal);
***************
*** 597,601 ****
from the parser argument. Returns 0 if out of memory. Otherwise
returns a new XML_Parser object. */
! XML_Parser XMLPARSEAPI
XML_ExternalEntityParserCreate(XML_Parser parser,
const XML_Char *context,
--- 602,606 ----
from the parser argument. Returns 0 if out of memory. Otherwise
returns a new XML_Parser object. */
! XMLPARSEAPI XML_Parser
XML_ExternalEntityParserCreate(XML_Parser parser,
const XML_Char *context,
***************
*** 627,631 ****
entities is requested; otherwise it will return non-zero. */
! int XMLPARSEAPI
XML_SetParamEntityParsing(XML_Parser parser,
enum XML_ParamEntityParsing parsing);
--- 632,636 ----
entities is requested; otherwise it will return non-zero. */
! XMLPARSEAPI int
XML_SetParamEntityParsing(XML_Parser parser,
enum XML_ParamEntityParsing parsing);
***************
*** 661,665 ****
returns information about the error. */
! enum XML_Error XMLPARSEAPI
XML_GetErrorCode(XML_Parser parser);
--- 666,670 ----
returns information about the error. */
! XMLPARSEAPI enum XML_Error
XML_GetErrorCode(XML_Parser parser);
***************
*** 679,683 ****
Returns 0 if the event is in an internal entity. */
! int XMLPARSEAPI
XML_GetCurrentByteCount(XML_Parser parser);
--- 684,688 ----
Returns 0 if the event is in an internal entity. */
! XMLPARSEAPI int
XML_GetCurrentByteCount(XML_Parser parser);
***************
*** 692,696 ****
the handler that makes the call. */
! const char * XMLPARSEAPI
XML_GetInputContext(XML_Parser parser,
int *offset,
--- 697,701 ----
the handler that makes the call. */
! XMLPARSEAPI const char *
XML_GetInputContext(XML_Parser parser,
int *offset,
***************
*** 703,715 ****
/* Frees memory used by the parser. */
! void XMLPARSEAPI
XML_ParserFree(XML_Parser parser);
/* Returns a string describing the error. */
! const XML_LChar * XMLPARSEAPI
XML_ErrorString(int code);
/* Return a string containing the version number of this expat */
! const XML_LChar * XMLPARSEAPI
XML_ExpatVersion(void);
--- 708,720 ----
/* Frees memory used by the parser. */
! XMLPARSEAPI void
XML_ParserFree(XML_Parser parser);
/* Returns a string describing the error. */
! XMLPARSEAPI const XML_LChar *
XML_ErrorString(int code);
/* Return a string containing the version number of this expat */
! XMLPARSEAPI const XML_LChar *
XML_ExpatVersion(void);
***************
*** 723,727 ****
number information for this version of expat */
! XML_Expat_Version XMLPARSEAPI
XML_ExpatVersionInfo(void);
--- 728,732 ----
number information for this version of expat */
! XMLPARSEAPI XML_Expat_Version
XML_ExpatVersionInfo(void);