bump bundled expat to 1.95.1

win32 project _needs_ updating and i don't have windows

1 files changed, 38 insertions, 13 deletions

diff --git a/main/php_compat.h b/main/php_compat.h
index 116fedfe1b..156f31f72d 100644
--- a/main/php_compat.h
+++ b/main/php_compat.h
@@ -25,9 +25,10 @@
 #define hashTableIterInit	php_hashTableIterInit
 #define hashTableIterNext	php_hashTableIterNext
 
-#ifndef HAVE_LIBEXPAT2
+#ifdef HAVE_LIBEXPAT_BUNDLED
 #define XML_DefaultCurrent php_XML_DefaultCurrent
 #define XML_ErrorString php_XML_ErrorString
+#define XML_ExpatVersion php_XML_ExpatVersion
 #define XML_ExternalEntityParserCreate php_XML_ExternalEntityParserCreate
 #define XML_GetBase php_XML_GetBase
 #define XML_GetBuffer php_XML_GetBuffer
@@ -36,39 +37,63 @@
 #define XML_GetCurrentColumnNumber php_XML_GetCurrentColumnNumber
 #define XML_GetCurrentLineNumber php_XML_GetCurrentLineNumber
 #define XML_GetErrorCode php_XML_GetErrorCode
+#define XML_GetIdAttributeIndex php_XML_GetIdAttributeIndex
+#define XML_GetInputContext php_XML_GetInputContext
 #define XML_GetSpecifiedAttributeCount php_XML_GetSpecifiedAttributeCount
-#define XML_Parse php_XML_Parse
+#define XmlGetUtf16InternalEncodingNS php_XmlGetUtf16InternalEncodingNS
+#define XmlGetUtf16InternalEncoding php_XmlGetUtf16InternalEncoding
+#define XmlGetUtf8InternalEncodingNS php_XmlGetUtf8InternalEncodingNS
+#define XmlGetUtf8InternalEncoding php_XmlGetUtf8InternalEncoding
+#define XmlInitEncodingNS php_XmlInitEncodingNS
+#define XmlInitEncoding php_XmlInitEncoding
+#define XmlInitUnknownEncodingNS php_XmlInitUnknownEncodingNS
+#define XmlInitUnknownEncoding php_XmlInitUnknownEncoding
 #define XML_ParseBuffer php_XML_ParseBuffer
-#define XML_ParserCreate php_XML_ParserCreate
+#define XML_Parse php_XML_Parse
+#define XML_ParserCreate_MM php_XML_ParserCreate_MM
 #define XML_ParserCreateNS php_XML_ParserCreateNS
+#define XML_ParserCreate php_XML_ParserCreate
 #define XML_ParserFree php_XML_ParserFree
+#define XmlParseXmlDeclNS php_XmlParseXmlDeclNS
+#define XmlParseXmlDecl php_XmlParseXmlDecl
+#define XmlPrologStateInitExternalEntity php_XmlPrologStateInitExternalEntity
+#define XmlPrologStateInit php_XmlPrologStateInit
+#define XML_SetAttlistDeclHandler php_XML_SetAttlistDeclHandler
 #define XML_SetBase php_XML_SetBase
 #define XML_SetCdataSectionHandler php_XML_SetCdataSectionHandler
 #define XML_SetCharacterDataHandler php_XML_SetCharacterDataHandler
 #define XML_SetCommentHandler php_XML_SetCommentHandler
-#define XML_SetDefaultHandler php_XML_SetDefaultHandler
 #define XML_SetDefaultHandlerExpand php_XML_SetDefaultHandlerExpand
+#define XML_SetDefaultHandler php_XML_SetDefaultHandler
+#define XML_SetDoctypeDeclHandler php_XML_SetDoctypeDeclHandler
+#define XML_SetElementDeclHandler php_XML_SetElementDeclHandler
 #define XML_SetElementHandler php_XML_SetElementHandler
 #define XML_SetEncoding php_XML_SetEncoding
-#define XML_SetExternalEntityRefHandler php_XML_SetExternalEntityRefHandler
+#define XML_SetEndCdataSectionHandler php_XML_SetEndCdataSectionHandler
+#define XML_SetEndDoctypeDeclHandler php_XML_SetEndDoctypeDeclHandler
+#define XML_SetEndElementHandler php_XML_SetEndElementHandler
+#define XML_SetEndNamespaceDeclHandler php_XML_SetEndNamespaceDeclHandler
+#define XML_SetEntityDeclHandler php_XML_SetEntityDeclHandler
 #define XML_SetExternalEntityRefHandlerArg php_XML_SetExternalEntityRefHandlerArg
+#define XML_SetExternalEntityRefHandler php_XML_SetExternalEntityRefHandler
 #define XML_SetNamespaceDeclHandler php_XML_SetNamespaceDeclHandler
-#define XML_SetNotStandaloneHandler php_XML_SetNotStandaloneHandler
 #define XML_SetNotationDeclHandler php_XML_SetNotationDeclHandler
+#define XML_SetNotStandaloneHandler php_XML_SetNotStandaloneHandler
+#define XML_SetParamEntityParsing php_XML_SetParamEntityParsing
 #define XML_SetProcessingInstructionHandler php_XML_SetProcessingInstructionHandler
+#define XML_SetReturnNSTriplet php_XML_SetReturnNSTriplet
+#define XML_SetStartCdataSectionHandler php_XML_SetStartCdataSectionHandler
+#define XML_SetStartDoctypeDeclHandler php_XML_SetStartDoctypeDeclHandler
+#define XML_SetStartElementHandler php_XML_SetStartElementHandler
+#define XML_SetStartNamespaceDeclHandler php_XML_SetStartNamespaceDeclHandler
 #define XML_SetUnknownEncodingHandler php_XML_SetUnknownEncodingHandler
 #define XML_SetUnparsedEntityDeclHandler php_XML_SetUnparsedEntityDeclHandler
 #define XML_SetUserData php_XML_SetUserData
-#define XML_UseParserAsHandlerArg php_XML_UseParserAsHandlerArg
-#define XmlGetUtf16InternalEncoding php_XmlGetUtf16InternalEncoding
-#define XmlGetUtf8InternalEncoding php_XmlGetUtf8InternalEncoding
-#define XmlInitEncoding php_XmlInitEncoding
-#define XmlInitUnknownEncoding php_XmlInitUnknownEncoding
-#define XmlParseXmlDecl php_XmlParseXmlDecl
+#define XML_SetXmlDeclHandler php_XML_SetXmlDeclHandler
 #define XmlSizeOfUnknownEncoding php_XmlSizeOfUnknownEncoding
+#define XML_UseParserAsHandlerArg php_XML_UseParserAsHandlerArg
 #define XmlUtf16Encode php_XmlUtf16Encode
 #define XmlUtf8Encode php_XmlUtf8Encode
-#define XmlPrologStateInit php_XmlPrologStateInit
 #endif
 
 #endif