From f0187ef3c9b35d4a7530bf5563c5bf9bea3802c6 Mon Sep 17 00:00:00 2001 From: Sascha Schumann Date: Fri, 26 Nov 1999 18:34:27 +0000 Subject: [PATCH] Use php_init_output_globals() also in non-ZTS mode --- ext/standard/output.c | 15 +++++---------- main/output.c | 15 +++++---------- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/ext/standard/output.c b/ext/standard/output.c index 22a8a25092..2af09bccf2 100644 --- a/ext/standard/output.c +++ b/ext/standard/output.c @@ -52,10 +52,12 @@ typedef struct { } php_output_globals; #ifdef ZTS +#define OLS_D php_output_globals *output_globals #define OG(v) (output_globals->v) #define OLS_FETCH() php_output_globals *output_globals = ts_resource(output_globals_id) int output_globals_id; #else +#define OLS_D #define OG(v) (output_globals.v) #define OLS_FETCH() php_output_globals output_globals; @@ -68,8 +70,7 @@ PHP_FUNCTION(ob_end_clean); PHP_FUNCTION(ob_get_contents); -#ifdef ZTS -static void php_output_init_globals(php_output_globals *output_globals) +static void php_output_init_globals(OLS_D) { OG(php_body_write) = NULL; OG(php_header_write) = NULL; @@ -78,20 +79,14 @@ static void php_output_init_globals(php_output_globals *output_globals) OG(ob_block_size) = 0; OG(ob_text_length) = 0; } -#endif PHP_GINIT_FUNCTION(output) { #ifdef ZTS output_globals_id = ts_allocate_id(sizeof(php_output_globals), NULL, NULL); -#else - OG(php_body_write) = NULL; - OG(php_header_write) = NULL; - OG(ob_buffer) = NULL; - OG(ob_size) = 0; - OG(ob_block_size) = 0; - OG(ob_text_length) = 0; +#else + php_output_init_globals(); #endif return SUCCESS; diff --git a/main/output.c b/main/output.c index 22a8a25092..2af09bccf2 100644 --- a/main/output.c +++ b/main/output.c @@ -52,10 +52,12 @@ typedef struct { } php_output_globals; #ifdef ZTS +#define OLS_D php_output_globals *output_globals #define OG(v) (output_globals->v) #define OLS_FETCH() php_output_globals *output_globals = ts_resource(output_globals_id) int output_globals_id; #else +#define OLS_D #define OG(v) (output_globals.v) #define OLS_FETCH() php_output_globals output_globals; @@ -68,8 +70,7 @@ PHP_FUNCTION(ob_end_clean); PHP_FUNCTION(ob_get_contents); -#ifdef ZTS -static void php_output_init_globals(php_output_globals *output_globals) +static void php_output_init_globals(OLS_D) { OG(php_body_write) = NULL; OG(php_header_write) = NULL; @@ -78,20 +79,14 @@ static void php_output_init_globals(php_output_globals *output_globals) OG(ob_block_size) = 0; OG(ob_text_length) = 0; } -#endif PHP_GINIT_FUNCTION(output) { #ifdef ZTS output_globals_id = ts_allocate_id(sizeof(php_output_globals), NULL, NULL); -#else - OG(php_body_write) = NULL; - OG(php_header_write) = NULL; - OG(ob_buffer) = NULL; - OG(ob_size) = 0; - OG(ob_block_size) = 0; - OG(ob_text_length) = 0; +#else + php_output_init_globals(); #endif return SUCCESS; -- 2.40.0