cvs: php4 /ext/overload overload.c

phanto Tue Apr 30 19:34:13 2002 EDT Modified files: /php4/ext/overload overload.c Log: ZE2 compatibility fixes Index: php4/ext/overload/overload.c diff -u php4/ext/overload/overload.c:1.17 php4/ext/overload/overload.c:1.18 --- php4/ext/overload/overload.c:1.17 Wed Apr 17 01:19:10 2002 +++ php4/ext/overload/overload.c Tue Apr 30 19:34:09 2002 @@ -184,7 +184,7 @@ temp_ce = *Z_OBJCE_P(object); DISABLE_HANDLERS(temp_ce); orig_ce = Z_OBJCE_P(object); - Z_OBJCE_P(object) = &temp_ce; + Z_OBJ_P(object)->ce = &temp_ce; result_ptr->is_ref = 1; result_ptr->refcount = 1; @@ -203,7 +203,7 @@ &retval, 1, args, 0, NULL TSRMLS_CC); - Z_OBJCE_P(object) = orig_ce; + Z_OBJ_P(object)->ce = orig_ce; if (call_result == FAILURE || !retval) { php_error(E_WARNING, "unable to call %s::" GET_HANDLER "_%s() handler", Z_OBJCE_P(object)->name, Z_STRVAL_P(prop_name)); @@ -221,7 +221,7 @@ &retval, 2, args, 0, NULL TSRMLS_CC); - Z_OBJCE_P(object) = orig_ce; + Z_OBJ_P(object)->ce = orig_ce; if (call_result == FAILURE || !retval) { php_error(E_WARNING, "unable to call %s::" GET_HANDLER "() handler", Z_OBJCE_P(object)->name); @@ -269,7 +269,7 @@ temp_ce = *Z_OBJCE_P(object); DISABLE_HANDLERS(temp_ce); orig_ce = Z_OBJCE_P(object); - Z_OBJCE_P(object) = &temp_ce; + Z_OBJ_P(object)->ce = &temp_ce; if (value->refcount == 0) { MAKE_STD_ZVAL(value_copy); @@ -291,7 +291,7 @@ &retval, 1, args, 0, NULL TSRMLS_CC); - Z_OBJCE_P(object) = orig_ce; + Z_OBJ_P(object)->ce = orig_ce; if (call_result == FAILURE || !retval) { php_error(E_WARNING, "unable to call %s::" SET_HANDLER "_%s() handler", Z_OBJCE_P(object)->name, Z_STRVAL_P(prop_name)); @@ -309,7 +309,7 @@ &retval, 2, args, 0, NULL TSRMLS_CC); - Z_OBJCE_P(object) = orig_ce; + Z_OBJ_P(object)->ce = orig_ce; if (call_result == FAILURE || !retval) { php_error(E_WARNING, "unable to call %s::" SET_HANDLER "() handler", orig_ce->name); @@ -541,7 +541,7 @@ temp_ce = *Z_OBJCE_P(object); DISABLE_HANDLERS(temp_ce); orig_ce = Z_OBJCE_P(object); - Z_OBJCE_P(object) = &temp_ce; + Z_OBJ_P(object)->ce = &temp_ce; ZVAL_STRINGL(&call_handler, CALL_HANDLER, sizeof(CALL_HANDLER)-1, 0); ZVAL_STRINGL(&method_name, Z_STRVAL(method->element), Z_STRLEN(method->element), 0); @@ -568,7 +568,7 @@ &retval, 3, handler_args, 0, NULL TSRMLS_CC); - Z_OBJCE_P(object) = orig_ce; + Z_OBJ_P(object)->ce = orig_ce; zval_ptr_dtor(&arg_array); if (call_result == FAILURE || !retval) {