diff options
| author | Michael Wallner <mike@php.net> | 2012-05-15 09:44:01 +0200 |
|---|---|---|
| committer | Michael Wallner <mike@php.net> | 2012-05-15 09:44:01 +0200 |
| commit | 2d11e55b948d99be8743c5ce61a3fdc6c3b6f2a0 (patch) | |
| tree | 36c82c946ba41417058648217232b8fc414050eb /main/php_output.h | |
| parent | d03900dc92af6d47921143f226217eae3ca564b7 (diff) | |
| parent | 0ad53bfd7da12a92a46c08e3fff579a15026b88b (diff) | |
| download | php-git-2d11e55b948d99be8743c5ce61a3fdc6c3b6f2a0.tar.gz | |
cleanup merge
Diffstat (limited to 'main/php_output.h')
| -rw-r--r-- | main/php_output.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/main/php_output.h b/main/php_output.h index e4ab0f920a..d050a141a1 100644 --- a/main/php_output.h +++ b/main/php_output.h @@ -45,6 +45,7 @@ /* handler status flags */ #define PHP_OUTPUT_HANDLER_STARTED 0x1000 #define PHP_OUTPUT_HANDLER_DISABLED 0x2000 +#define PHP_OUTPUT_HANDLER_PROCESSED 0x4000 /* handler op return values */ typedef enum _php_output_handler_status_t { @@ -82,7 +83,7 @@ typedef enum _php_output_handler_hook_t { } php_output_handler_hook_t; #define PHP_OUTPUT_HANDLER_INITBUF_SIZE(s) \ -( (s) ? \ +( ((s) > 1) ? \ (s) + PHP_OUTPUT_HANDLER_ALIGNTO_SIZE - ((s) % (PHP_OUTPUT_HANDLER_ALIGNTO_SIZE)) : \ PHP_OUTPUT_HANDLER_DEFAULT_SIZE \ ) |