Fix compile error when php_libxml.h is included in C++

nielsdos · nielsdos · commit 0cab86527541 · 2023-10-15T11:48:14.000+02:00
See php/pecl-xml-xmldiff#1
diff --git a/NEWS b/NEWS
@@ -7,6 +7,8 @@ PHP                                                                        NEWS
 
 - DOM:
   . Fix registerNodeClass with abstract class crashing. (nielsdos)
+  . Fix compile error when php_libxml.h header is included in C++.
+    (Remi, nielsdos)
 
 - Fiber:
   . Fixed bug GH-11121 (ReflectionFiber segfault). (danog, trowski, bwoebi)
diff --git a/ext/libxml/php_libxml.h b/ext/libxml/php_libxml.h
@@ -106,8 +106,8 @@ static zend_always_inline void php_libxml_invalidate_node_list_cache(php_libxml_
 static zend_always_inline void php_libxml_invalidate_node_list_cache_from_doc(xmlDocPtr docp)
 {
 	if (docp && docp->_private) { /* docp is NULL for detached nodes */
-		php_libxml_node_ptr *private = docp->_private;
-		php_libxml_node_object *object_private = private->_private;
+		php_libxml_node_ptr *node_private = (php_libxml_node_ptr *) docp->_private;
+		php_libxml_node_object *object_private = (php_libxml_node_object *) node_private->_private;
 		if (object_private) {
 			php_libxml_invalidate_node_list_cache(object_private->document);
 		}

Original file line number	Diff line number	Diff line change
`@@ -106,8 +106,8 @@ static zend_always_inline void php_libxml_invalidate_node_list_cache(php_libxml_`
`106`	`106`	`static zend_always_inline void php_libxml_invalidate_node_list_cache_from_doc(xmlDocPtr docp)`
`107`	`107`	`{`
`108`	`108`	`if (docp && docp->_private) { /* docp is NULL for detached nodes */`
`109`		`- php_libxml_node_ptr *private = docp->_private;`
`110`		`- php_libxml_node_object *object_private = private->_private;`
	`109`	`+ php_libxml_node_ptr node_private = (php_libxml_node_ptr ) docp->_private;`
	`110`	`+ php_libxml_node_object object_private = (php_libxml_node_object ) node_private->_private;`
`111`	`111`	`if (object_private) {`
`112`	`112`	`php_libxml_invalidate_node_list_cache(object_private->document);`
`113`	`113`	`}`