diff options
| author | Xinchen Hui <laruence@php.net> | 2014-10-30 11:54:00 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-10-30 11:54:00 +0800 |
| commit | 429b0bb38a32b85e2f56d7669724f1c5aa902baa (patch) | |
| tree | abc6f2a23fb182019d06da55dc325d3b8988ed59 | |
| parent | 64a44eab77a0a98ee411e8dee3440bf9f38bdd9d (diff) | |
| parent | 9e1da42af18265d007b5246f01895d3cafc78939 (diff) | |
| download | php-git-429b0bb38a32b85e2f56d7669724f1c5aa902baa.tar.gz | |
Merge branch 'PHP-5.6'
| -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 b45b72f2d6..3cafebb730 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 701f2434d9..b66fe7c066 100644 --- a/main/php_output.h +++ b/main/php_output.h @@ -151,11 +151,7 @@ ZEND_BEGIN_MODULE_GLOBALS(output) int flags; 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 |