diff options
Diffstat (limited to 'main/php_output.h')
| -rw-r--r-- | main/php_output.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/main/php_output.h b/main/php_output.h index 34c344534c..5d2ea5f9e8 100644 --- a/main/php_output.h +++ b/main/php_output.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2015 The PHP Group | + | Copyright (c) 1997-2016 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -95,7 +95,7 @@ typedef struct _php_output_buffer { size_t size; size_t used; uint free:1; - uint _res:31; + uint _reserved:31; } php_output_buffer; typedef struct _php_output_context { @@ -104,9 +104,6 @@ typedef struct _php_output_context { php_output_buffer out; } php_output_context; -/* XXX remove this after TLS branch merge */ -#define PHP_OUTPUT_TSRMLS(ctx) - /* old-style, stateless callback */ typedef void (*php_output_handler_func_t)(char *output, size_t output_len, char **handled_output, size_t *handled_output_len, int mode); /* new-style, opaque context callback */ @@ -149,7 +146,7 @@ ZEND_BEGIN_MODULE_GLOBALS(output) int flags; ZEND_END_MODULE_GLOBALS(output) -PHPAPI 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 |