diff options
| author | Michael Wallner <mike@php.net> | 2010-06-02 12:49:12 +0000 |
|---|---|---|
| committer | Michael Wallner <mike@php.net> | 2010-06-02 12:49:12 +0000 |
| commit | 99da695ec90890c3de9d4ae17c2e26133ab9bdc4 (patch) | |
| tree | 539b1c500dc218d0bd98b80e9c299d407928e6ba | |
| parent | 2b2802738cc70f59c7c6c3979a563dbd11b2cf0b (diff) | |
| download | php-git-99da695ec90890c3de9d4ae17c2e26133ab9bdc4.tar.gz | |
fix cxx build
| -rw-r--r-- | main/output.c | 4 | ||||
| -rw-r--r-- | main/php_output.h | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/main/output.c b/main/output.c index 9fd253779d..29585ca352 100644 --- a/main/output.c +++ b/main/output.c @@ -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 diff --git a/main/php_output.h b/main/php_output.h index 921ac0dc6e..57fbcce2a0 100644 --- a/main/php_output.h +++ b/main/php_output.h @@ -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) |