diff options
| author | Xinchen Hui <laruence@php.net> | 2014-10-30 11:52:29 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-10-30 11:52:29 +0800 |
| commit | 9e1da42af18265d007b5246f01895d3cafc78939 (patch) | |
| tree | 9a0ccf9b2f30d4019cef6d3b22bcfc02ec1e1719 | |
| parent | 7b4993dd169a082c2fe79f975224057d1e16c779 (diff) | |
| download | php-git-9e1da42af18265d007b5246f01895d3cafc78939.tar.gz | |
Use macro
| -rw-r--r-- | main/output.c | 6 | ||||
| -rw-r--r-- | main/php_output.h | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/main/output.c b/main/output.c index be5a222853..1dac7179b8 100644 --- a/main/output.c +++ b/main/output.c @@ -35,11 +35,7 @@ #include "zend_stack.h" #include "php_output.h" -#ifdef ZTS -PHPAPI int output_globals_id; -#else -PHPAPI zend_output_globals output_globals; -#endif +ZEND_DECLARE_MODULE_GLOBALS(output); 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 edea0bff33..6c4b1f7a42 100644 --- a/main/php_output.h +++ b/main/php_output.h @@ -152,11 +152,7 @@ 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 zend_output_globals output_globals; -#endif +ZEND_EXTERN_MODULE_GLOBALS(output); /* there should not be a need to use OG() from outside of output.c */ #ifdef ZTS |