cvs: php4 /ext/standard basic_functions.c basic_functions.h output.c php_output.h

andi Tue May 22 12:19:04 2001 EDT Modified files: /php4/ext/standard basic_functions.c basic_functions.h output.c php_output.h Log: - Start nuking not needed GINIT Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.345 php4/ext/standard/basic_functions.c:1.346 --- php4/ext/standard/basic_functions.c:1.345 Mon May 21 08:44:25 2001 +++ php4/ext/standard/basic_functions.c Tue May 22 12:19:04 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.345 2001/05/21 15:44:25 andrei Exp $ */ +/* $Id: basic_functions.c,v 1.346 2001/05/22 19:19:04 andi Exp $ */ #include "php.h" #include "php_main.h" @@ -653,9 +653,7 @@ 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 @@ 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); @@ -908,14 +907,6 @@ munmap(BG(mmap_file), BG(mmap_len)); } #endif - - return SUCCESS; -} - - -PHP_GINIT_FUNCTION(basic) -{ - PHP_GINIT(output)(GINIT_FUNC_ARGS_PASSTHRU); return SUCCESS; } Index: php4/ext/standard/basic_functions.h diff -u php4/ext/standard/basic_functions.h:1.79 php4/ext/standard/basic_functions.h:1.80 --- php4/ext/standard/basic_functions.h:1.79 Mon May 21 08:44:25 2001 +++ php4/ext/standard/basic_functions.h Tue May 22 12:19:04 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.h,v 1.79 2001/05/21 15:44:25 andrei Exp $ */ +/* $Id: basic_functions.h,v 1.80 2001/05/22 19:19:04 andi Exp $ */ #ifndef BASIC_FUNCTIONS_H #define BASIC_FUNCTIONS_H @@ -39,7 +39,6 @@ PHP_RINIT_FUNCTION(basic); PHP_RSHUTDOWN_FUNCTION(basic); PHP_MINFO_FUNCTION(basic); -PHP_GINIT_FUNCTION(basic); PHP_FUNCTION(constant); PHP_FUNCTION(intval); Index: php4/ext/standard/output.c diff -u php4/ext/standard/output.c:1.54 php4/ext/standard/output.c:1.55 --- php4/ext/standard/output.c:1.54 Mon May 7 15:00:13 2001 +++ php4/ext/standard/output.c Tue May 22 12:19:04 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: output.c,v 1.54 2001/05/07 22:00:13 zeev Exp $ */ +/* $Id: output.c,v 1.55 2001/05/22 19:19:04 andi Exp $ */ #include "php.h" #include "ext/standard/head.h" @@ -59,7 +59,7 @@ } -PHP_GINIT_FUNCTION(output) +PHP_MINIT_FUNCTION(output) { #ifdef ZTS output_globals_id = ts_allocate_id(sizeof(php_output_globals), (ts_allocate_ctor) php_output_init_globals, NULL); Index: php4/ext/standard/php_output.h diff -u php4/ext/standard/php_output.h:1.23 php4/ext/standard/php_output.h:1.24 --- php4/ext/standard/php_output.h:1.23 Tue Mar 6 08:28:51 2001 +++ php4/ext/standard/php_output.h Tue May 22 12:19:04 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_output.h,v 1.23 2001/03/06 16:28:51 zeev Exp $ */ +/* $Id: php_output.h,v 1.24 2001/05/22 19:19:04 andi Exp $ */ #ifndef PHP_OUTPUT_H #define PHP_OUTPUT_H @@ -47,7 +47,7 @@ PHP_FUNCTION(ob_get_length); PHP_FUNCTION(ob_implicit_flush); -PHP_GINIT_FUNCTION(output); +PHP_MINIT_FUNCTION(output); typedef struct _php_ob_buffer { char *buffer;