diff options
| author | Sebastian Bergmann <sebastian@php.net> | 2003-06-28 05:38:52 +0000 |
|---|---|---|
| committer | Sebastian Bergmann <sebastian@php.net> | 2003-06-28 05:38:52 +0000 |
| commit | 10ec176f69b0bc383242328ca71e28a4ffdcc1dd (patch) | |
| tree | 9ba0875176a173e6a8f855f4c28d832e770807b1 /ext/standard/basic_functions.c | |
| parent | 57ddcca06e83aa8ea2fcb3f27d02830660cd0e59 (diff) | |
| download | php-git-10ec176f69b0bc383242328ca71e28a4ffdcc1dd.tar.gz | |
Buckle your seatbelt, Dorothy, 'cause Aggregation is going bye-bye.
Diffstat (limited to 'ext/standard/basic_functions.c')
| -rw-r--r-- | ext/standard/basic_functions.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 920fc9ed26..3466aaad7c 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -903,20 +903,6 @@ function_entry basic_functions[] = { PHP_FE(stream_bucket_append, NULL) PHP_FE(stream_bucket_new, NULL) - /* functions from aggregate.c */ - PHP_FE(aggregate, first_arg_force_ref) - PHP_FE(aggregate_methods, first_arg_force_ref) - PHP_FE(aggregate_methods_by_list, first_arg_force_ref) - PHP_FE(aggregate_properties, first_arg_force_ref) - PHP_FE(aggregate_properties_by_list, first_arg_force_ref) -#if (HAVE_PCRE || HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE) - PHP_FE(aggregate_methods_by_regexp, first_arg_force_ref) - PHP_FE(aggregate_properties_by_regexp, first_arg_force_ref) -#endif - PHP_FE(deaggregate, first_arg_force_ref) - PHP_FE(aggregate_info, first_arg_force_ref) - PHP_FALIAS(aggregation_info, aggregate_info, first_arg_force_ref) - PHP_FE(output_add_rewrite_var, NULL) PHP_FE(output_reset_rewrite_vars, NULL) PHP_FE(date_sunrise, NULL) @@ -1009,7 +995,6 @@ static void basic_globals_ctor(php_basic_globals *basic_globals_p TSRMLS_DC) BG(next) = NULL; BG(left) = -1; BG(user_tick_functions) = NULL; - BG(aggregation_table) = NULL; BG(user_filter_map) = NULL; BG(user_compare_func_ptr) = NULL; BG(array_walk_func_ptr) = NULL; @@ -1235,12 +1220,6 @@ PHP_RSHUTDOWN_FUNCTION(basic) BG(user_tick_functions) = NULL; } - if (BG(aggregation_table)) { - zend_hash_destroy(BG(aggregation_table)); - efree(BG(aggregation_table)); - BG(aggregation_table) = NULL; - } - if (BG(user_filter_map)) { zend_hash_destroy(BG(user_filter_map)); efree(BG(user_filter_map)); |