From d83fdc677ff86055b437d9c5157868aa4dde0962 Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Wed, 30 Aug 2006 22:34:32 +0000 Subject: [PATCH] - fix PHP_OUTPUT_CONFLICT macro --- main/php_output.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/main/php_output.h b/main/php_output.h index 8a4c8567a5..48a70e289f 100644 --- a/main/php_output.h +++ b/main/php_output.h @@ -242,15 +242,16 @@ PHPAPI int php_output_handler_reverse_conflict_register(zval *handler_name, php_ #define PHP_OUTPUT_CONFLICT(check_name, action) \ { \ - char *tmp_s = (check_name); \ + int tmp_i; \ zval tmp_z; \ + char *tmp_s = (check_name); \ INIT_PZVAL(&tmp_z); \ ZVAL_ASCII_STRING(&tmp_z, tmp_s, ZSTR_DUPLICATE); \ - if (php_output_handler_conflict(handler_name, &tmp_z TSRMLS_CC)) { \ - zval_dtor(&tmp_z); \ + tmp_i = php_output_handler_conflict(handler_name, &tmp_z TSRMLS_CC); \ + zval_dtor(&tmp_z); \ + if (tmp_i) { \ action; \ } \ - zval_dtor(&tmp_z); \ } PHPAPI php_output_handler_alias_ctor_t *php_output_handler_alias(zval *handler_name TSRMLS_DC); -- 2.40.0