sebastian Sat Jun 28 01:38:53 2003 EDT
Removed files:
/php-src/ext/standard aggregation.c aggregation.h
Modified files:
/php-src/ext/standard basic_functions.c basic_functions.h config.m4
php_standard.h
/php-src/win32 php4dll.dsp php4dllts.dsp
Log:
Buckle your seatbelt, Dorothy, 'cause Aggregation is going bye-bye.
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.615
php-src/ext/standard/basic_functions.c:1.616
--- php-src/ext/standard/basic_functions.c:1.615 Fri Jun 13 17:33:59 2003
+++ php-src/ext/standard/basic_functions.c Sat Jun 28 01:38:52 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.615 2003/06/13 21:33:59 pollita Exp $ */
+/* $Id: basic_functions.c,v 1.616 2003/06/28 05:38:52 sebastian Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -903,20 +903,6 @@
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 @@
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;
@@ -1233,12 +1218,6 @@
zend_llist_destroy(BG(user_tick_functions));
efree(BG(user_tick_functions));
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)) {
Index: php-src/ext/standard/basic_functions.h
diff -u php-src/ext/standard/basic_functions.h:1.120
php-src/ext/standard/basic_functions.h:1.121
--- php-src/ext/standard/basic_functions.h:1.120 Tue Jun 10 16:03:37 2003
+++ php-src/ext/standard/basic_functions.h Sat Jun 28 01:38:52 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.h,v 1.120 2003/06/10 20:03:37 imajes Exp $ */
+/* $Id: basic_functions.h,v 1.121 2003/06/28 05:38:52 sebastian Exp $ */
#ifndef BASIC_FUNCTIONS_H
#define BASIC_FUNCTIONS_H
@@ -197,7 +197,6 @@
size_t mmap_len;
#endif
- HashTable *aggregation_table;
HashTable *user_filter_map;
} php_basic_globals;
Index: php-src/ext/standard/config.m4
diff -u php-src/ext/standard/config.m4:1.60 php-src/ext/standard/config.m4:1.61
--- php-src/ext/standard/config.m4:1.60 Thu Jun 5 00:14:43 2003
+++ php-src/ext/standard/config.m4 Sat Jun 28 01:38:52 2003
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.60 2003/06/05 04:14:43 sniper Exp $ -*- sh -*-
+dnl $Id: config.m4,v 1.61 2003/06/28 05:38:52 sebastian Exp $ -*- sh -*-
divert(3)dnl
@@ -283,7 +283,7 @@
url_scanner.c var.c versioning.c assert.c strnatcmp.c
levenshtein.c \
incomplete_class.c url_scanner_ex.c ftp_fopen_wrapper.c \
http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \
- var_unserializer.c ftok.c aggregation.c sha1.c
user_filters.c \
+ var_unserializer.c ftok.c sha1.c user_filters.c \
filters.c proc_open.c sunfuncs.c streamsfuncs.c)
PHP_ADD_MAKEFILE_FRAGMENT
Index: php-src/ext/standard/php_standard.h
diff -u php-src/ext/standard/php_standard.h:1.21
php-src/ext/standard/php_standard.h:1.22
--- php-src/ext/standard/php_standard.h:1.21 Tue Jun 10 16:03:38 2003
+++ php-src/ext/standard/php_standard.h Sat Jun 28 01:38:52 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_standard.h,v 1.21 2003/06/10 20:03:38 imajes Exp $ */
+/* $Id: php_standard.h,v 1.22 2003/06/28 05:38:52 sebastian Exp $ */
#include "basic_functions.h"
#include "php_math.h"
@@ -59,7 +59,6 @@
#include "php_versioning.h"
#include "php_ftok.h"
#include "php_type.h"
-#include "aggregation.h"
#include "php_sunfuncs.h"
#define phpext_standard_ptr basic_functions_module_ptr
Index: php-src/win32/php4dll.dsp
diff -u php-src/win32/php4dll.dsp:1.48 php-src/win32/php4dll.dsp:1.49
--- php-src/win32/php4dll.dsp:1.48 Thu Jun 26 11:16:56 2003
+++ php-src/win32/php4dll.dsp Sat Jun 28 01:38:52 2003
@@ -124,10 +124,6 @@
# PROP Default_Filter ""
# Begin Source File
-SOURCE=..\ext\standard\aggregation.c
-# End Source File
-# Begin Source File
-
SOURCE=..\ext\standard\css.c
# End Source File
# Begin Source File
@@ -246,10 +242,6 @@
# Begin Group "Header Files"
# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\ext\standard\aggregation.h
-# End Source File
# Begin Source File
SOURCE=..\ext\standard\config.w32.h
Index: php-src/win32/php4dllts.dsp
diff -u php-src/win32/php4dllts.dsp:1.121 php-src/win32/php4dllts.dsp:1.122
--- php-src/win32/php4dllts.dsp:1.121 Fri Jun 27 17:59:53 2003
+++ php-src/win32/php4dllts.dsp Sat Jun 28 01:38:52 2003
@@ -153,10 +153,6 @@
# PROP Default_Filter ""
# Begin Source File
-SOURCE=..\ext\standard\aggregation.c
-# End Source File
-# Begin Source File
-
SOURCE=..\ext\standard\css.c
# End Source File
# Begin Source File
@@ -263,10 +259,6 @@
# Begin Group "Header Files"
# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\ext\standard\aggregation.h
-# End Source File
# Begin Source File
SOURCE=..\main\config.w32.h
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
