Merge branch 'PHP-8.3'

nielsdos · nielsdos · commit f9844f0348af · 2024-07-04T15:41:15.000+02:00
* PHP-8.3: [ci skip] NEWS Backport libxml2 2.13.2 fixes (#14816)
diff --git a/ext/libxml/php_libxml.h b/ext/libxml/php_libxml.h
@@ -268,9 +268,6 @@ static zend_always_inline void php_libxml_sanitize_parse_ctxt_options(xmlParserC
 	ctxt->options = 0;
 	ZEND_DIAGNOSTIC_IGNORED_END
 }
-
-#else /* HAVE_LIBXML */
-#define libxml_module_ptr NULL
 #endif
 
 #define phpext_libxml_ptr libxml_module_ptr

Original file line number	Diff line number	Diff line change
`@@ -268,9 +268,6 @@ static zend_always_inline void php_libxml_sanitize_parse_ctxt_options(xmlParserC`
`268`	`268`	`ctxt->options = 0;`
`269`	`269`	`ZEND_DIAGNOSTIC_IGNORED_END`
`270`	`270`	`}`
`271`		`-`
`272`		`-#else /* HAVE_LIBXML */`
`273`		`-#define libxml_module_ptr NULL`
`274`	`271`	`#endif`
`275`	`272`
`276`	`273`	`#define phpext_libxml_ptr libxml_module_ptr`