From: Pierre Joye Date: Sun, 23 Jan 2011 09:46:06 +0000 (+0000) Subject: - kill local redeclaration by using a less common name X-Git-Tag: php-5.4.0alpha1~191^2~329 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fc4853f34b735ac808fcf37ec836b2cd1cd32c20;p=php - kill local redeclaration by using a less common name --- diff --git a/ext/filter/filter_private.h b/ext/filter/filter_private.h index 51b88e2ee7..4f52d4bbcb 100644 --- a/ext/filter/filter_private.h +++ b/ext/filter/filter_private.h @@ -114,10 +114,10 @@ #define PHP_FILTER_GET_LONG_OPT(zv, opt) { \ if (Z_TYPE_PP(zv) != IS_LONG) { \ - zval tmp = **zv; \ - zval_copy_ctor(&tmp); \ - convert_to_long(&tmp); \ - opt = Z_LVAL(tmp); \ + zval ___tmp = **zv; \ + zval_copy_ctor(&___tmp); \ + convert_to_long(&___tmp); \ + opt = Z_LVAL(___tmp); \ } else { \ opt = Z_LVAL_PP(zv); \ } \