- Fix possible crashes if PHP is linked with external libexpat and also

  the bundled one is compiled in.

diff --git a/main/php_compat.h b/main/php_compat.h
index 5a415d873da9658ff06500402a647bfb0d48db6e..3215d58f6f09b18d608302c1865ba657cec3ba90 100644 (file)
--- a/main/php_compat.h
+++ b/main/php_compat.h
@@ -49,7 +49,9 @@
 #define XmlGetUtf8InternalEncodingNS php_XmlGetUtf8InternalEncodingNS
 #define XmlGetUtf8InternalEncoding php_XmlGetUtf8InternalEncoding
 #define XmlInitEncoding php_XmlInitEncoding
+#define XmlInitEncodingNS php_XmlInitEncodingNS
 #define XmlInitUnknownEncoding php_XmlInitUnknownEncoding
+#define XmlInitUnknownEncodingNS php_XmlInitUnknownEncodingNS
 #define XML_ParseBuffer php_XML_ParseBuffer
 #define XML_Parse php_XML_Parse
 #define XML_ParserCreate_MM php_XML_ParserCreate_MM
@@ -57,6 +59,7 @@
 #define XML_ParserCreate php_XML_ParserCreate
 #define XML_ParserFree php_XML_ParserFree
 #define XmlParseXmlDecl php_XmlParseXmlDecl
+#define XmlParseXmlDeclNS php_XmlParseXmlDeclNS
 #define XmlPrologStateInitExternalEntity php_XmlPrologStateInitExternalEntity
 #define XmlPrologStateInit php_XmlPrologStateInit
 #define XML_SetAttlistDeclHandler php_XML_SetAttlistDeclHandler
@@ -95,6 +98,13 @@
 #define XML_UseParserAsHandlerArg php_XML_UseParserAsHandlerArg
 #define XmlUtf16Encode php_XmlUtf16Encode
 #define XmlUtf8Encode php_XmlUtf8Encode
+#define XML_FreeContentModel php_XML_FreeContentModel
+#define XML_MemMalloc php_XML_MemMalloc
+#define XML_MemRealloc php_XML_MemRealloc
+#define XML_MemFree php_XML_MemFree
+#define XML_UseForeignDTD php_XML_UseForeignDTD
+#define XML_GetFeatureList php_XML_GetFeatureList
+#define XML_ParserReset php_XML_ParserReset
 #endif
 
 #ifdef PHP_EXPORTS