Back-substitute for Z_* macro's. If it breaks some extension (the script isn't optimal, it parses for example var->zval.value incorrect) please let me know.

1 files changed, 3 insertions, 3 deletions

diff --git a/ext/qtdom/qtdom.c b/ext/qtdom/qtdom.c
index fc1809e94c..ab5acba883 100644
--- a/ext/qtdom/qtdom.c
+++ b/ext/qtdom/qtdom.c
@@ -125,7 +125,7 @@ static int qdom_find_attributes( zval **children, struct qdom_attribute *attr TS
 
         MAKE_STD_ZVAL(child);
         object_init_ex(child, qdomnode_class_entry_ptr);
-        zend_hash_next_index_insert((*children)->value.ht, &child, sizeof(zval *), NULL);
+        zend_hash_next_index_insert(Z_ARRVAL_PP(children), &child, sizeof(zval *), NULL);
         add_property_stringl(child, "name", (char *) node->Name, strlen(node->Name), 1);
         add_property_long(child, "type", node->Type);
         add_property_stringl(child, "content", (char *) node->Content, strlen(node->Content), 1);
@@ -164,7 +164,7 @@ static int qdom_find_children( zval **children, struct qdom_node *orig_node TSRM
 
         MAKE_STD_ZVAL(child);
         object_init_ex(child, qdomnode_class_entry_ptr);
-        zend_hash_next_index_insert((*children)->value.ht, &child, sizeof(zval *), NULL);
+        zend_hash_next_index_insert(Z_ARRVAL_PP(children), &child, sizeof(zval *), NULL);
         add_property_stringl(child, "name", (char *) node->Name, strlen(node->Name), 1);
         add_property_long(child, "type", node->Type);
         if ( node->Type == 2 || node->Type == 3 || node->Type == 4 )
@@ -228,7 +228,7 @@ PHP_FUNCTION(qdom_tree)
     object_init_ex(return_value, qdomdoc_class_entry_ptr);
 	add_property_stringl(return_value, "version", (char *) qt_ver, strlen(qt_ver), 1);
 
-    doc = qdom_do_init( arg->value.str.val );
+    doc = qdom_do_init( Z_STRVAL_P(arg) );
 
     qdom_do_doc_type( doc, &qdom_type_name );