cvs: php4 /ext/com com.h conversion.c

andi Sat Jul 28 15:23:21 2001 EDT Modified files: /php4/ext/com com.h conversion.c Log: - More object macros Index: php4/ext/com/com.h diff -u php4/ext/com/com.h:1.7 php4/ext/com/com.h:1.8 --- php4/ext/com/com.h:1.7 Sun Jun 24 17:19:48 2001 +++ php4/ext/com/com.h Sat Jul 28 15:23:20 2001 @@ -20,21 +20,21 @@ } comval; #define ZVAL_COM(z,o) { \ - pval *handle; \ + zval *handle; \ \ + /* OBJECTS_FIXME */ \ Z_TYPE_P(z) = IS_OBJECT; \ - (z)->value.obj.ce = &com_class_entry; \ + Z_OBJCE_P(z) = &com_class_entry; \ \ - ALLOC_HASHTABLE((z)->value.obj.properties); \ - zend_hash_init((z)->value.obj.properties, 0, NULL, ZVAL_PTR_DTOR, 0); \ + ALLOC_HASHTABLE(Z_OBJPROP_P(z)); \ + zend_hash_init(Z_OBJPROP_P(z), 0, NULL, ZVAL_PTR_DTOR, 0); \ \ ALLOC_ZVAL(handle); \ INIT_PZVAL(handle); \ ZVAL_LONG(handle, zend_list_insert((o), IS_COM)); \ \ - pval_copy_constructor(handle); \ - zend_hash_index_update((z)->value.obj.properties, 0, \ - &handle, sizeof(pval *), NULL); \ + zval_copy_ctor(handle); \ + zend_hash_index_update(Z_OBJPROP_P(z), 0, &handle, sizeof(zval *), NULL); \ } #define RETVAL_COM(o) ZVAL_COM(&return_value, o) Index: php4/ext/com/conversion.c diff -u php4/ext/com/conversion.c:1.25 php4/ext/com/conversion.c:1.26 --- php4/ext/com/conversion.c:1.25 Tue Jul 24 06:42:27 2001 +++ php4/ext/com/conversion.c Sat Jul 28 15:23:20 2001 @@ -386,7 +386,7 @@ pval **var_handle; /* fetch the VARIANT structure */ - zend_hash_index_find(pval_arg->value.obj.properties, 0, (void **) &var_handle); + zend_hash_index_find(Z_OBJPROP_P(pval_arg), 0, (void **) &var_handle); V_VT(var_arg) = VT_VARIANT|VT_BYREF; V_VARIANTREF(var_arg) = (VARIANT FAR*) zend_list_find(Z_LVAL_P(*var_handle), &tp); @@ -900,8 +900,8 @@ int type; /* fetch the comval structure */ - zend_hash_index_find(pval_arg->value.obj.properties, 0, (void **) &comval_handle); - obj = (comval *)zend_list_find(Z_LVAL_P(*comval_handle), &type); + zend_hash_index_find(Z_OBJPROP_P(pval_arg), 0, (void **) &comval_handle); + obj = (comval *) zend_list_find(Z_LVAL_P(*comval_handle), &type); if(!obj || (type != IS_COM) || !C_ISREFD(obj)) { VariantInit(var_arg);