diff options
author | Sam Ruby <rubys@php.net> | 1999-11-23 03:10:46 +0000 |
---|---|---|
committer | Sam Ruby <rubys@php.net> | 1999-11-23 03:10:46 +0000 |
commit | 53856104500bb727e3ba615c2da7c1f0c3358876 (patch) | |
tree | ee5adaf9cd307b11bf4cbfb7686b7986bbe857a8 /main/output.c | |
parent | 43d857f5e5da36c97bbebca7007cb2c725e91fe0 (diff) | |
download | php-git-53856104500bb727e3ba615c2da7c1f0c3358876.tar.gz |
errors during startup trap server
Diffstat (limited to 'main/output.c')
-rw-r--r-- | main/output.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/main/output.c b/main/output.c index 0eecddb40f..6a25ab3761 100644 --- a/main/output.c +++ b/main/output.c @@ -81,7 +81,7 @@ static void php_output_init_globals(php_output_globals *output_globals) #endif -PHP_MINIT_FUNCTION(output) +PHP_GINIT_FUNCTION(output) { #ifdef ZTS output_globals_id = ts_allocate_id(sizeof(php_output_globals), NULL, NULL); @@ -111,15 +111,16 @@ PHP_RSHUTDOWN_FUNCTION(output); php3_module_entry output_module_entry = { "PHP_output", php_output_functions, - PHP_MINIT(output), /* extension-wide startup function */ - NULL, /* extension-wide shutdown function */ - PHP_RINIT(output), /* per-request startup function */ - PHP_RSHUTDOWN(output), /* per-request shutdown function */ - NULL, /* information function */ - STANDARD_MODULE_PROPERTIES + NULL, /* extension-wide startup function */ + NULL, /* extension-wide shutdown function */ + PHP_RINIT(output), /* per-request startup function */ + PHP_RSHUTDOWN(output), /* per-request shutdown function */ + NULL, /* information function */ + PHP_GINIT(output), /* global startup function */ + NULL, /* global shutdown function */ + STANDARD_MODULE_PROPERTIES_EX }; - PHP_RINIT_FUNCTION(output) { php_output_startup(); |