mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 10:24:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix cxx build

Browse Source
This commit is contained in:
Michael Wallner 2010-06-02 12:49:12 +00:00
parent 2b2802738c
commit 99da695ec9
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main/output.c
View File

@ -37,8 +37,8 @@
ZEND_DECLARE_MODULE_GLOBALS(output);
PHPAPI const char php_output_default_handler_name[sizeof("default output handler")] = "default output handler";
PHPAPI const char php_output_devnull_handler_name[sizeof("null output handler")] = "null output handler";
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";
#if PHP_OUTPUT_NOINLINE || PHP_OUTPUT_DEBUG
# undef inline

7
main/php_output.h
View File

@ -140,9 +140,6 @@ typedef struct _php_output_handler {
} func;
} php_output_handler;
PHPAPI const char php_output_default_handler_name[sizeof("default output handler")];
PHPAPI const char php_output_devnull_handler_name[sizeof("null output handler")];
ZEND_BEGIN_MODULE_GLOBALS(output)
int flags;
zend_stack *handlers;
@ -177,6 +174,10 @@ ZEND_END_MODULE_GLOBALS(output);
BEGIN_EXTERN_C()
extern const char php_output_default_handler_name[sizeof("default output handler")];
extern const char php_output_devnull_handler_name[sizeof("null output handler")];
#define php_output_tearup() \
php_output_startup(); \
php_output_activate(TSRMLS_C)