pajoye Sun, 23 Jan 2011 09:46:06 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=307670
Log: - kill local redeclaration by using a less common name Changed paths: U php/php-src/branches/PHP_5_3/ext/filter/filter_private.h U php/php-src/trunk/ext/filter/filter_private.h Modified: php/php-src/branches/PHP_5_3/ext/filter/filter_private.h =================================================================== --- php/php-src/branches/PHP_5_3/ext/filter/filter_private.h 2011-01-23 09:02:29 UTC (rev 307669) +++ php/php-src/branches/PHP_5_3/ext/filter/filter_private.h 2011-01-23 09:46:06 UTC (rev 307670) @@ -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); \ } \ Modified: php/php-src/trunk/ext/filter/filter_private.h =================================================================== --- php/php-src/trunk/ext/filter/filter_private.h 2011-01-23 09:02:29 UTC (rev 307669) +++ php/php-src/trunk/ext/filter/filter_private.h 2011-01-23 09:46:06 UTC (rev 307670) @@ -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); \ } \
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php