From 7020d641ea4386384b1d8a38f7bfad61d5b20ae7 Mon Sep 17 00:00:00 2001 From: "peter%propagandism.org" Date: Wed, 2 Nov 2005 07:41:42 +0000 Subject: [PATCH] Part of fix for bug 192139 (Intergrate latest Expat). r=Pike, sr=jst. --- content/xslt/src/xml/txXMLParser.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/content/xslt/src/xml/txXMLParser.cpp b/content/xslt/src/xml/txXMLParser.cpp index 6eab219f218..2fa11ff46ca 100644 --- a/content/xslt/src/xml/txXMLParser.cpp +++ b/content/xslt/src/xml/txXMLParser.cpp @@ -154,18 +154,18 @@ txParseFromStream(istream& aInputStream, const nsAString& aUri, // shortcut macro for redirection into txXMLParser method calls #define TX_XMLPARSER(_userData) NS_STATIC_CAST(txXMLParser*, _userData) -PR_STATIC_CALLBACK(int) +PR_STATIC_CALLBACK(void) startElement(void *aUserData, const XML_Char *aName, const XML_Char **aAtts) { NS_ENSURE_TRUE(aUserData, XML_ERROR_NONE); - return TX_XMLPARSER(aUserData)->StartElement(aName, aAtts); + TX_XMLPARSER(aUserData)->StartElement(aName, aAtts); } -PR_STATIC_CALLBACK(int) +PR_STATIC_CALLBACK(void) endElement(void *aUserData, const XML_Char* aName) { NS_ENSURE_TRUE(aUserData, XML_ERROR_NONE); - return TX_XMLPARSER(aUserData)->EndElement(aName); + TX_XMLPARSER(aUserData)->EndElement(aName); } PR_STATIC_CALLBACK(void) @@ -188,11 +188,11 @@ commentHandler(void* aUserData, const XML_Char* aChars) TX_XMLPARSER(aUserData)->Comment(aChars); } -PR_STATIC_CALLBACK(int) +PR_STATIC_CALLBACK(void) piHandler(void *aUserData, const XML_Char *aTarget, const XML_Char *aData) { NS_ENSURE_TRUE(aUserData, XML_ERROR_NONE); - return TX_XMLPARSER(aUserData)->ProcessingInstruction(aTarget, aData); + TX_XMLPARSER(aUserData)->ProcessingInstruction(aTarget, aData); } PR_STATIC_CALLBACK(int)