diff options
| author | Anatol Belski <ab@php.net> | 2014-10-30 10:28:05 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-10-30 10:28:05 +0100 |
| commit | e6874a9b419db82dcfefa0a260fb289577b414b6 (patch) | |
| tree | 291f50a4a77d2c992f20dbfa9e163be092233823 /main/php_output.h | |
| parent | fced6e614811834d4edda6c0e4af9b769177ef2c (diff) | |
| parent | 73e2dd338133602825d55b29b8dfb93c3c2c9e2f (diff) | |
| download | php-git-e6874a9b419db82dcfefa0a260fb289577b414b6.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
add DLL export to the output globals
Diffstat (limited to 'main/php_output.h')
| -rw-r--r-- | main/php_output.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/php_output.h b/main/php_output.h index b66fe7c066..535b09b46c 100644 --- a/main/php_output.h +++ b/main/php_output.h @@ -151,7 +151,7 @@ ZEND_BEGIN_MODULE_GLOBALS(output) 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 |