com php-src: Merge branch 'PHP-5.6': main/output.c main/php_o utput.h
| From: | Xinchen Hui | Date: | Thu, 30 Oct 2014 03:54:00 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': main/output.c main/php_o utput.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82884@lists.php.net to get a copy of this message | ||
Commit: 429b0bb38a32b85e2f56d7669724f1c5aa902baa
Author: Xinchen Hui <laruence@php.net> Thu, 30 Oct 2014 11:54:00 +0800
Parents: 64a44eab77a0a98ee411e8dee3440bf9f38bdd9d 9e1da42af18265d007b5246f01895d3cafc78939
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=429b0bb38a32b85e2f56d7669724f1c5aa902baa
Log:
Merge branch 'PHP-5.6'
Changed paths:
MM main/output.c
MM main/php_output.h
Diff:
diff --cc main/php_output.h
index 701f243,6c4b1f7..b66fe7c
--- a/main/php_output.h
+++ b/main/php_output.h
@@@ -148,14 -150,9 +148,10 @@@ ZEND_BEGIN_MODULE_GLOBALS(output
php_output_handler *running;
const char *output_start_filename;
int output_start_lineno;
+ 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