clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.6'

Browse Source 
* PHP-5.6:
  add DLL export to the output globals
This commit is contained in:
Anatol Belski 2014-10-30 10:28:05 +01:00
commit e6874a9b41
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/output.c
View File

@ -35,7 +35,7 @@
#include "zend_stack.h"
#include "php_output.h"
ZEND_DECLARE_MODULE_GLOBALS(output);
PHPAPI ZEND_DECLARE_MODULE_GLOBALS(output);
const char php_output_default_handler_name[sizeof("default output handler")] = "default output handler";
const char php_output_devnull_handler_name[sizeof("null output handler")] = "null output handler";

2
main/php_output.h
View File

@ -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