diff options
| author | Xinchen Hui <laruence@php.net> | 2014-10-30 11:42:40 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-10-30 11:42:40 +0800 |
| commit | 64a44eab77a0a98ee411e8dee3440bf9f38bdd9d (patch) | |
| tree | bbf288a537ad586c4372b147db6c1a8d260d9e82 | |
| parent | d77ce317636919a87daa7f8ffb2979474f9cade7 (diff) | |
| parent | 7b4993dd169a082c2fe79f975224057d1e16c779 (diff) | |
| download | php-git-64a44eab77a0a98ee411e8dee3440bf9f38bdd9d.tar.gz | |
Merge branch 'PHP-5.6'
| -rw-r--r-- | main/output.c | 2 | ||||
| -rw-r--r-- | main/php_output.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/main/output.c b/main/output.c index 05d6b27c52..b45b72f2d6 100644 --- a/main/output.c +++ b/main/output.c @@ -38,7 +38,7 @@ #ifdef ZTS PHPAPI int output_globals_id; #else -PHPAPI php_output_globals output_globals; +PHPAPI zend_output_globals output_globals; #endif const char php_output_default_handler_name[sizeof("default output handler")] = "default output handler"; diff --git a/main/php_output.h b/main/php_output.h index 6da02a4c2c..701f2434d9 100644 --- a/main/php_output.h +++ b/main/php_output.h @@ -154,7 +154,7 @@ ZEND_END_MODULE_GLOBALS(output) #ifdef ZTS PHPAPI extern int output_globals_id; #else -PHPAPI extern php_output_globals output_globals; +PHPAPI extern zend_output_globals output_globals; #endif /* there should not be a need to use OG() from outside of output.c */ |