From 177934732b654d6888380b62120b2cacbf7caca0 Mon Sep 17 00:00:00 2001 From: Andi Gutmans Date: Tue, 22 May 2001 19:19:04 +0000 Subject: - Start nuking not needed GINIT --- ext/standard/basic_functions.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'ext/standard/basic_functions.c') diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 7ec8294132..99a29f0a85 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -653,9 +653,7 @@ zend_module_entry basic_functions_module = { PHP_RINIT(basic), /* request startup */ PHP_RSHUTDOWN(basic), /* request shutdown */ PHP_MINFO(basic), /* extension info */ - PHP_GINIT(basic), /* global startup function */ - NULL, /* global shutdown function */ - STANDARD_MODULE_PROPERTIES_EX + STANDARD_MODULE_PROPERTIES }; #if defined(HAVE_PUTENV) @@ -749,6 +747,7 @@ PHP_MINIT_FUNCTION(basic) register_html_constants(INIT_FUNC_ARGS_PASSTHRU); register_string_constants(INIT_FUNC_ARGS_PASSTHRU); + PHP_MINIT(output)(INIT_FUNC_ARGS_PASSTHRU); PHP_MINIT(regex)(INIT_FUNC_ARGS_PASSTHRU); PHP_MINIT(file)(INIT_FUNC_ARGS_PASSTHRU); PHP_MINIT(pack)(INIT_FUNC_ARGS_PASSTHRU); @@ -913,14 +912,6 @@ PHP_RSHUTDOWN_FUNCTION(basic) } -PHP_GINIT_FUNCTION(basic) -{ - PHP_GINIT(output)(GINIT_FUNC_ARGS_PASSTHRU); - - return SUCCESS; -} - - PHP_MINFO_FUNCTION(basic) { php_info_print_table_start(); -- cgit v1.2.1