Fixes for compilation problems on Tru64 reported by Mark Favas

diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c
index a1ef8cbbffbd33510eef0482c7e842eb8ea6bae0..a403d9479473dc43778636f725766c7c0ec9cbaf 100644 (file)
--- a/Modules/pyexpat.c
+++ b/Modules/pyexpat.c
@@ -66,7 +66,7 @@ struct HandlerInfo {
        xmlhandler handler;
 };
 
-staticforward struct HandlerInfo handler_info[];
+staticforward struct HandlerInfo handler_info[64];
 
 /* Convert an array of attributes and their values into a Python dict */
 
@@ -984,49 +984,49 @@ void pyxml_SetEndCdataSection( XML_Parser *parser,
 statichere struct HandlerInfo handler_info[]=
 {{"StartElementHandler", 
        pyxml_SetStartElementHandler, 
-       my_StartElementHandler},
+        (xmlhandler)my_StartElementHandler},
 {"EndElementHandler", 
        pyxml_SetEndElementHandler, 
-       my_EndElementHandler},
+       (xmlhandler)my_EndElementHandler},
 {"ProcessingInstructionHandler", 
        (xmlhandlersetter)XML_SetProcessingInstructionHandler,
-       my_ProcessingInstructionHandler},
+       (xmlhandler)my_ProcessingInstructionHandler},
 {"CharacterDataHandler", 
        (xmlhandlersetter)XML_SetCharacterDataHandler,
-       my_CharacterDataHandler},
+       (xmlhandler)my_CharacterDataHandler},
 {"UnparsedEntityDeclHandler", 
        (xmlhandlersetter)XML_SetUnparsedEntityDeclHandler,
-       my_UnparsedEntityDeclHandler },
+       (xmlhandler)my_UnparsedEntityDeclHandler },
 {"NotationDeclHandler", 
        (xmlhandlersetter)XML_SetNotationDeclHandler,
-       my_NotationDeclHandler },
+       (xmlhandler)my_NotationDeclHandler },
 {"StartNamespaceDeclHandler", 
        pyxml_SetStartNamespaceDeclHandler,
-       my_StartNamespaceDeclHandler },
+       (xmlhandler)my_StartNamespaceDeclHandler },
 {"EndNamespaceDeclHandler", 
        pyxml_SetEndNamespaceDeclHandler,
-       my_EndNamespaceDeclHandler },
+       (xmlhandler)my_EndNamespaceDeclHandler },
 {"CommentHandler",
        (xmlhandlersetter)XML_SetCommentHandler,
-       my_CommentHandler},
+       (xmlhandler)my_CommentHandler},
 {"StartCdataSectionHandler",
        pyxml_SetStartCdataSection,
-       my_StartCdataSectionHandler},
+       (xmlhandler)my_StartCdataSectionHandler},
 {"EndCdataSectionHandler",
        pyxml_SetEndCdataSection,
-       my_EndCdataSectionHandler},
+       (xmlhandler)my_EndCdataSectionHandler},
 {"DefaultHandler",
        (xmlhandlersetter)XML_SetDefaultHandler,
-       my_DefaultHandler},
+       (xmlhandler)my_DefaultHandler},
 {"DefaultHandlerExpand",
        (xmlhandlersetter)XML_SetDefaultHandlerExpand,
-       my_DefaultHandlerExpandHandler},
+       (xmlhandler)my_DefaultHandlerExpandHandler},
 {"NotStandaloneHandler",
        (xmlhandlersetter)XML_SetNotStandaloneHandler,
-       my_NotStandaloneHandler},
+       (xmlhandler)my_NotStandaloneHandler},
 {"ExternalEntityRefHandler",
        (xmlhandlersetter)XML_SetExternalEntityRefHandler,
-       my_ExternalEntityRefHandler },
+       (xmlhandler)my_ExternalEntityRefHandler },
 
 {NULL, NULL, NULL } /* sentinel */
 };