From: Fred Drake <fdrake@acm.org>
Date: Wed, 25 Sep 2002 22:31:35 +0000 (+0000)
Subject: The Python 2.2.x version of pyexpat needs more changes to avoid type
X-Git-Tag: v2.2.2b1~105
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aa57a207b71717cce41c8a01b78f655d1e3e0982;p=thirdparty%2FPython%2Fcpython.git

The Python 2.2.x version of pyexpat needs more changes to avoid type
issues with varying versions of Expat; this completes the previous fix
for this version.  (Not relevant for the trunk.)
---

diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c
index d50d30fbb70c..7b2f6c824e85 100644
--- a/Modules/pyexpat.c
+++ b/Modules/pyexpat.c
@@ -1756,7 +1756,7 @@ pyxml_UpdatePairedHandlers(xmlparseobject *self,
 }
 
 static void
-pyxml_SetStartElementHandler(XML_Parser *parser, void *junk)
+pyxml_SetStartElementHandler(XML_Parser parser, void *junk)
 {
     pyxml_UpdatePairedHandlers((xmlparseobject *)XML_GetUserData(parser),
                                StartElement, EndElement,
@@ -1764,7 +1764,7 @@ pyxml_SetStartElementHandler(XML_Parser *parser, void *junk)
 }
 
 static void
-pyxml_SetEndElementHandler(XML_Parser *parser, void *junk)
+pyxml_SetEndElementHandler(XML_Parser parser, void *junk)
 {
     pyxml_UpdatePairedHandlers((xmlparseobject *)XML_GetUserData(parser), 
                                StartElement, EndElement,
@@ -1772,7 +1772,7 @@ pyxml_SetEndElementHandler(XML_Parser *parser, void *junk)
 }
 
 static void
-pyxml_SetStartNamespaceDeclHandler(XML_Parser *parser, void *junk)
+pyxml_SetStartNamespaceDeclHandler(XML_Parser parser, void *junk)
 {
     pyxml_UpdatePairedHandlers((xmlparseobject *)XML_GetUserData(parser), 
                                StartNamespaceDecl, EndNamespaceDecl,
@@ -1780,7 +1780,7 @@ pyxml_SetStartNamespaceDeclHandler(XML_Parser *parser, void *junk)
 }
 
 static void
-pyxml_SetEndNamespaceDeclHandler(XML_Parser *parser, void *junk)
+pyxml_SetEndNamespaceDeclHandler(XML_Parser parser, void *junk)
 {
     pyxml_UpdatePairedHandlers((xmlparseobject *)XML_GetUserData(parser), 
                                StartNamespaceDecl, EndNamespaceDecl,
@@ -1788,7 +1788,7 @@ pyxml_SetEndNamespaceDeclHandler(XML_Parser *parser, void *junk)
 }
 
 static void
-pyxml_SetStartCdataSection(XML_Parser *parser, void *junk)
+pyxml_SetStartCdataSection(XML_Parser parser, void *junk)
 {
     pyxml_UpdatePairedHandlers((xmlparseobject *)XML_GetUserData(parser),
                                StartCdataSection, EndCdataSection,
@@ -1796,7 +1796,7 @@ pyxml_SetStartCdataSection(XML_Parser *parser, void *junk)
 }
 
 static void
-pyxml_SetEndCdataSection(XML_Parser *parser, void *junk)
+pyxml_SetEndCdataSection(XML_Parser parser, void *junk)
 {
     pyxml_UpdatePairedHandlers((xmlparseobject *)XML_GetUserData(parser), 
                                StartCdataSection, EndCdataSection, 
@@ -1806,7 +1806,7 @@ pyxml_SetEndCdataSection(XML_Parser *parser, void *junk)
 #if EXPAT_VERSION >= 0x010200
 
 static void
-pyxml_SetStartDoctypeDeclHandler(XML_Parser *parser, void *junk)
+pyxml_SetStartDoctypeDeclHandler(XML_Parser parser, void *junk)
 {
     pyxml_UpdatePairedHandlers((xmlparseobject *)XML_GetUserData(parser),
                                StartDoctypeDecl, EndDoctypeDecl,
@@ -1814,7 +1814,7 @@ pyxml_SetStartDoctypeDeclHandler(XML_Parser *parser, void *junk)
 }
 
 static void
-pyxml_SetEndDoctypeDeclHandler(XML_Parser *parser, void *junk)
+pyxml_SetEndDoctypeDeclHandler(XML_Parser parser, void *junk)
 {
     pyxml_UpdatePairedHandlers((xmlparseobject *)XML_GetUserData(parser),
                                StartDoctypeDecl, EndDoctypeDecl,