cvs: php4 /ext/standard aggregation.c

stas Sun Jan 12 09:43:05 2003 EDT Modified files: /php4/ext/standard aggregation.c Log: Disable ZE2-incompatible parts # This should be rewritten for ZE2 anyway... Index: php4/ext/standard/aggregation.c diff -u php4/ext/standard/aggregation.c:1.13 php4/ext/standard/aggregation.c:1.14 --- php4/ext/standard/aggregation.c:1.13 Tue Dec 31 11:07:30 2002 +++ php4/ext/standard/aggregation.c Sun Jan 12 09:43:04 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: aggregation.c,v 1.13 2002/12/31 16:07:30 sebastian Exp $ */ +/* $Id: aggregation.c,v 1.14 2003/01/12 14:43:04 stas Exp $ */ #include "php.h" #include "basic_functions.h" @@ -409,7 +409,9 @@ * time. */ /* OBJECT FIXME!! won't work with non-standard objects */ +#ifndef ZEND_ENGINE_2 (Z_OBJ_P(obj))->ce = new_ce; +#endif aggr_info_new.new_ce = new_ce; MAKE_STD_ZVAL(aggr_info_new.aggr_members); array_init(aggr_info_new.aggr_members); @@ -630,7 +632,9 @@ } /* OBJECT FIXME!! won't work with non-standard objects */ +#ifndef ZEND_ENGINE_2 (Z_OBJ_P(obj))->ce = orig_ce; +#endif zend_hash_index_del(BG(aggregation_table), (long)obj); } }