cvs: php4 /ext/domxml php_domxml.c

joey Sat Aug 11 16:44:30 2001 EDT Modified files: /php4/ext/domxml php_domxml.c Log: Let domxml compile with ZendEngine2. Index: php4/ext/domxml/php_domxml.c diff -u php4/ext/domxml/php_domxml.c:1.54 php4/ext/domxml/php_domxml.c:1.55 --- php4/ext/domxml/php_domxml.c:1.54 Sat Aug 11 12:38:25 2001 +++ php4/ext/domxml/php_domxml.c Sat Aug 11 16:44:30 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_domxml.c,v 1.54 2001/08/11 16:38:25 zeev Exp $ */ +/* $Id: php_domxml.c,v 1.55 2001/08/11 20:44:30 joey Exp $ */ #ifdef HAVE_CONFIG_H @@ -2368,11 +2368,11 @@ /* Get the attributes of the current node and add it as a property */ if(node_attributes(&attributes, last TSRMLS_CC) >= 0) - zend_hash_update(child->value.obj.properties, "attributes", sizeof("attributes"), (void *) &attributes, sizeof(zval *), NULL); + zend_hash_update(Z_OBJPROP_P(child), "attributes", sizeof("attributes"), (void *) &attributes, sizeof(zval *), NULL); /* Get recursively the children of the current node and add it as a property */ if(node_children(&mchildren, last->children TSRMLS_CC) >= 0) - zend_hash_update(child->value.obj.properties, "children", sizeof("children"), (void *) &mchildren, sizeof(zval *), NULL); + zend_hash_update(Z_OBJPROP_P(child), "children", sizeof("children"), (void *) &mchildren, sizeof(zval *), NULL); count++; last = last->next; } @@ -2420,7 +2420,7 @@ Thanks to Paul DuBois for pointing me at this. */ if (node_children(&children, root TSRMLS_CC) >= 0) { - zend_hash_update(return_value->value.obj.properties, "children", + zend_hash_update(Z_OBJPROP_P(return_value), "children", sizeof("children"), (void *) &children, sizeof(zval *), NULL); } /* xmlFreeDoc(docp); */ @@ -2572,7 +2572,7 @@ child = php_domobject_new(node, &retnode TSRMLS_CC); zend_hash_next_index_insert(arr->value.ht, &child, sizeof(zval *), NULL); } - zend_hash_update(rv->value.obj.properties, "nodeset", sizeof("nodeset"), (void *) &arr, sizeof(zval *), NULL); + zend_hash_update(Z_OBJPROP_P(rv), "nodeset", sizeof("nodeset"), (void *) &arr, sizeof(zval *), NULL); break; } case XPATH_BOOLEAN: