archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-5.6'

Browse source
This commit is contained in:
Xinchen Hui 2014-10-30 11:54:00 +08:00
commit 429b0bb38a
2 changed files with 2 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
main/php_output.h
View file

@ -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