- Add OLS_C so that we can call php_output_init_globals() with it.

diff --git a/ext/standard/output.c b/ext/standard/output.c
index 2af09bccf2eba7e0abe07d94af1ec1ff8d7c715c..6dc9d42a39d369eb2120571c8995bf8c8970b406 100644 (file)
--- a/ext/standard/output.c
+++ b/ext/standard/output.c
@@ -53,11 +53,13 @@ typedef struct {
 
 #ifdef ZTS
 #define OLS_D php_output_globals *output_globals
+#define OLS_C 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 OLS_C
 #define OG(v) (output_globals.v)
 #define OLS_FETCH()
 php_output_globals output_globals;
@@ -86,7 +88,7 @@ PHP_GINIT_FUNCTION(output)
 #ifdef ZTS
        output_globals_id = ts_allocate_id(sizeof(php_output_globals), NULL, NULL);
 #else 
-       php_output_init_globals();
+       php_output_init_globals(OLS_C);
 #endif
 
        return SUCCESS;

diff --git a/main/output.c b/main/output.c
index 2af09bccf2eba7e0abe07d94af1ec1ff8d7c715c..6dc9d42a39d369eb2120571c8995bf8c8970b406 100644 (file)
--- a/main/output.c
+++ b/main/output.c
@@ -53,11 +53,13 @@ typedef struct {
 
 #ifdef ZTS
 #define OLS_D php_output_globals *output_globals
+#define OLS_C 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 OLS_C
 #define OG(v) (output_globals.v)
 #define OLS_FETCH()
 php_output_globals output_globals;
@@ -86,7 +88,7 @@ PHP_GINIT_FUNCTION(output)
 #ifdef ZTS
        output_globals_id = ts_allocate_id(sizeof(php_output_globals), NULL, NULL);
 #else 
-       php_output_init_globals();
+       php_output_init_globals(OLS_C);
 #endif
 
        return SUCCESS;