6 files changed, 6 insertions, 16 deletions
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();
diff --git a/ext/standard/basic_functions.h b/ext/standard/basic_functions.h
index 4169c7e70b..596829a34f 100644
--- a/ext/standard/basic_functions.h
+++ b/ext/standard/basic_functions.h
@@ -39,7 +39,6 @@ PHP_MSHUTDOWN_FUNCTION(basic);
 PHP_RINIT_FUNCTION(basic);
 PHP_RSHUTDOWN_FUNCTION(basic);
 PHP_MINFO_FUNCTION(basic);
-PHP_GINIT_FUNCTION(basic);
 
 PHP_FUNCTION(constant);
 PHP_FUNCTION(intval);
diff --git a/ext/standard/output.c b/ext/standard/output.c
index d5862ad5a7..701c20d5f4 100644
--- a/ext/standard/output.c
+++ b/ext/standard/output.c
@@ -59,7 +59,7 @@ static void php_output_init_globals(OLS_D)
 }
 
 
-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);
diff --git a/ext/standard/php_output.h b/ext/standard/php_output.h
index 39bb8954b2..ab9f799905 100644
--- a/ext/standard/php_output.h
+++ b/ext/standard/php_output.h
@@ -47,7 +47,7 @@ PHP_FUNCTION(ob_get_contents);
 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;
diff --git a/main/output.c b/main/output.c
index d5862ad5a7..701c20d5f4 100644
--- a/main/output.c
+++ b/main/output.c
@@ -59,7 +59,7 @@ static void php_output_init_globals(OLS_D)
 }
 
 
-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);
diff --git a/main/php_output.h b/main/php_output.h
index 39bb8954b2..ab9f799905 100644
--- a/main/php_output.h
+++ b/main/php_output.h
@@ -47,7 +47,7 @@ PHP_FUNCTION(ob_get_contents);
 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;