Disable ZE2-incompatible parts

# This should be rewritten for ZE2 anyway...

diff --git a/ext/standard/aggregation.c b/ext/standard/aggregation.c
index 77ba6a26d895cd54dc4fe4c14be77cc3e6c6a1e4..0173ae14e7b3c455d7f90b063112293dd2bd8fa5 100644 (file)
--- a/ext/standard/aggregation.c
+++ b/ext/standard/aggregation.c
@@ -409,7 +409,9 @@ static void aggregate(INTERNAL_FUNCTION_PARAMETERS, int aggr_what, int aggr_type
                 * 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 @@ PHP_FUNCTION(deaggregate)
                }
 
                /* 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);
        }
 }