diff options
| -rw-r--r-- | main/output.c | 6 | ||||
| -rw-r--r-- | main/php_output.h | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/main/output.c b/main/output.c index 1dac7179b8..c2b7b3422d 100644 --- a/main/output.c +++ b/main/output.c @@ -35,7 +35,11 @@ #include "zend_stack.h" #include "php_output.h" -ZEND_DECLARE_MODULE_GLOBALS(output); +#ifdef ZTS +PHPAPI int output_globals_id; +#else +PHPAPI php_output_globals output_globals; +#endif const char php_output_default_handler_name[sizeof("default output handler")] = "default output handler"; const char php_output_devnull_handler_name[sizeof("null output handler")] = "null output handler"; diff --git a/main/php_output.h b/main/php_output.h index 0312e256f8..947da2c915 100644 --- a/main/php_output.h +++ b/main/php_output.h @@ -152,6 +152,12 @@ ZEND_BEGIN_MODULE_GLOBALS(output) int output_start_lineno; ZEND_END_MODULE_GLOBALS(output) +#ifdef ZTS +PHPAPI extern int output_globals_id; +#else +PHPAPI extern php_output_globals output_globals; +#endif + /* there should not be a need to use OG() from outside of output.c */ #ifdef ZTS # define OG(v) TSRMG(output_globals_id, zend_output_globals *, v) |