com php-src: Merge branch 'PHP-5.6': main/output.c main/php_o utput.h
| From: | Anatol Belski | Date: | Thu, 30 Oct 2014 09:28:05 +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-82889@lists.php.net to get a copy of this message | ||
Commit: e6874a9b419db82dcfefa0a260fb289577b414b6
Author: Anatol Belski <ab@php.net> Thu, 30 Oct 2014 10:28:05 +0100
Parents: fced6e614811834d4edda6c0e4af9b769177ef2c 73e2dd338133602825d55b29b8dfb93c3c2c9e2f
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e6874a9b419db82dcfefa0a260fb289577b414b6
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
add DLL export to the output globals
Changed paths:
MM main/output.c
MM main/php_output.h
Diff:
diff --cc main/php_output.h
index b66fe7c,3831478..535b09b
--- a/main/php_output.h
+++ b/main/php_output.h
@@@ -148,10 -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)
- ZEND_EXTERN_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