diff options
| author | Andi Gutmans <andi@php.net> | 2001-07-28 18:55:49 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 2001-07-28 18:55:49 +0000 |
| commit | c8eccca0b18a0122b669a176078460e71e9fe7b0 (patch) | |
| tree | 26daffe2c98c44073f5ec0720fb3fa3f3534a693 /ext/rpc/com/variant.c | |
| parent | d42f85427aa56983b7907d7f74c270a63b5b0803 (diff) | |
| download | php-git-c8eccca0b18a0122b669a176078460e71e9fe7b0.tar.gz | |
- More Object macro work. I couldn't test this one so let me know if it
breaks the Windows build.
Diffstat (limited to 'ext/rpc/com/variant.c')
| -rw-r--r-- | ext/rpc/com/variant.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/rpc/com/variant.c b/ext/rpc/com/variant.c index 49a7335ca0..9eaca8d23b 100644 --- a/ext/rpc/com/variant.c +++ b/ext/rpc/com/variant.c @@ -169,8 +169,8 @@ void php_VARIANT_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_proper *object_handle = *return_value; pval_copy_constructor(object_handle); INIT_PZVAL(object_handle); - zend_hash_index_update(object->value.obj.properties, 0, &object_handle, sizeof(pval *), NULL); - pval_destructor(&function_name->element); + zend_hash_index_update(Z_OBJPROP_P(object), 0, &object_handle, sizeof(pval *), NULL); + zval_dtor(&function_name->element); } } @@ -184,7 +184,7 @@ pval php_VARIANT_get_property_handler(zend_property_reference *property_referenc VARIANT *var_arg; /* fetch the VARIANT structure */ - zend_hash_index_find(object->value.obj.properties, 0, (void **) &var_handle); + zend_hash_index_find(Z_OBJPROP_P(object), 0, (void **) &var_handle); var_arg = zend_list_find(Z_LVAL_PP(var_handle), &type); if(!var_arg || (type != IS_VARIANT)) @@ -220,7 +220,7 @@ pval php_VARIANT_get_property_handler(zend_property_reference *property_referenc php_error(E_WARNING, "Unknown method."); break; - pval_destructor(&overloaded_property->element); + zval_dtor(&overloaded_property->element); } } @@ -236,7 +236,7 @@ int php_VARIANT_set_property_handler(zend_property_reference *property_reference VARIANT *var_arg; /* fetch the VARIANT structure */ - zend_hash_index_find(object->value.obj.properties, 0, (void **) &var_handle); + zend_hash_index_find(Z_OBJPROP_P(object), 0, (void **) &var_handle); var_arg = zend_list_find(Z_LVAL_PP(var_handle), &type); if(!var_arg || (type != IS_VARIANT)) @@ -244,7 +244,7 @@ int php_VARIANT_set_property_handler(zend_property_reference *property_reference overloaded_property = (zend_overloaded_element *) property_reference->elements_list->head->data; do_VARIANT_propset(var_arg, &overloaded_property->element, value); - pval_destructor(&overloaded_property->element); + zval_dtor(&overloaded_property->element); return SUCCESS; } |