summaryrefslogtreecommitdiff
path: root/main/php_output.h
diff options
context:
space:
mode:
authorRasmus Lerdorf <rasmus@php.net>2014-11-06 10:19:45 -0800
committerRasmus Lerdorf <rasmus@php.net>2014-11-06 10:19:45 -0800
commit2375d659d7ba006429d4b3a28cf8a158f24b30db (patch)
tree608223966abbd29a02080b3cd99ca4847149c10a /main/php_output.h
parent50756b515c76bb9c43a01bfce03207906f596005 (diff)
parent8fccf0bac9eab67412612b2df14da58b9129c6b2 (diff)
downloadphp-git-2375d659d7ba006429d4b3a28cf8a158f24b30db.tar.gz
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
* 'PHP-5.6' of git.php.net:php-src: (142 commits) Fixed bug #68351 (PDO::PARAM_BOOL and ATTR_EMULATE_PREPARES misbehaving) Update NEWS Fixed bug #68331 - This was partial patch for https://wiki.php.net/rfc/session-lock-ini fix dir separator in test arg1-3 are not variable names to use; removed useless buffer variable update NEWS Fix bug #63595 GMP memory management conflicts with other libraries using GMP Initialize the offset table - PCRE may sometimes miss offsets set default response code to 200 set default response code to 200 set default response code to 200 Fixed bug #66584 Segmentation fault on statement deallocation Add credit fix ZTS build Added PGSQL_TEST_CONNSTR env var support for ext/pgsql tests Fixed bug #67462 PDO_PGSQL::beginTransaction() wrongly throws exception when not in transaction Fixed Bug #68104 (Segfault while pre-evaluating a disabled function) Temporarily disable wait/xml protocol... don't try to send in the test results until we restored qa.php.net Fix uninitialized value... ...
Diffstat (limited to 'main/php_output.h')
-rw-r--r--main/php_output.h2
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)