diff options
| author | George Wang <gwang@php.net> | 2014-11-03 11:44:13 -0500 |
|---|---|---|
| committer | George Wang <gwang@php.net> | 2014-11-03 11:44:13 -0500 |
| commit | bba11e32557c59e5d73a67c3f8770ecd2dcd9926 (patch) | |
| tree | 9791f6cee83a5497e82216b82c413a1794a53a31 /main/php_output.h | |
| parent | 4435161456740f8709fe0d5592bc195bb5be04ba (diff) | |
| parent | e12d69df0c013bf94b18136fe877f9af2ba15c02 (diff) | |
| download | php-git-bba11e32557c59e5d73a67c3f8770ecd2dcd9926.tar.gz | |
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
Diffstat (limited to 'main/php_output.h')
| -rw-r--r-- | main/php_output.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/main/php_output.h b/main/php_output.h index 0312e256f8..3831478b9f 100644 --- a/main/php_output.h +++ b/main/php_output.h @@ -152,6 +152,8 @@ ZEND_BEGIN_MODULE_GLOBALS(output) int output_start_lineno; ZEND_END_MODULE_GLOBALS(output) +PHPAPI ZEND_EXTERN_MODULE_GLOBALS(output); + /* 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) |