diff options
| author | Anatol Belski <ab@php.net> | 2014-10-29 20:04:56 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-10-29 20:04:56 +0100 |
| commit | d77ce317636919a87daa7f8ffb2979474f9cade7 (patch) | |
| tree | c9ebe2c7ad01661e7696a8f15d6d4842870f03ea /main/php_output.h | |
| parent | 23f089a6b3586d524e8709d75262029bc8fa7ad4 (diff) | |
| parent | fc904569ea5c5513925a69bf43820845eb3db104 (diff) | |
| download | php-git-d77ce317636919a87daa7f8ffb2979474f9cade7.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
fix output globals importing
export output globals
use portable strndup implementation
unix sockets aren't available on windows
dll export APIs needed by phpdbg
fix sapi/phpdbg/config.w32
Don't treat warnings as failures in the junit output
Diffstat (limited to 'main/php_output.h')
| -rw-r--r-- | main/php_output.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/main/php_output.h b/main/php_output.h index c176063c3b..6da02a4c2c 100644 --- a/main/php_output.h +++ b/main/php_output.h @@ -151,6 +151,12 @@ ZEND_BEGIN_MODULE_GLOBALS(output) int flags; 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) |