pajoye Fri, 09 Oct 2009 17:21:20 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=289431
Log: - Merge: don't hide early declaration Changed paths: U php/php-src/branches/PHP_5_3_1/Zend/zend_API.c Modified: php/php-src/branches/PHP_5_3_1/Zend/zend_API.c =================================================================== --- php/php-src/branches/PHP_5_3_1/Zend/zend_API.c 2009-10-09 17:15:46 UTC (rev 289430) +++ php/php-src/branches/PHP_5_3_1/Zend/zend_API.c 2009-10-09 17:21:20 UTC (rev 289431) @@ -1038,13 +1038,13 @@ Z_SET_ISREF_PP(q); zend_hash_add(CE_STATIC_MEMBERS(class_type), str_index, str_length, (void**)q, sizeof(zval*), NULL); } else { - zval *q; + zval *r; - ALLOC_ZVAL(q); - *q = **p; - INIT_PZVAL(q); - zval_copy_ctor(q); - zend_hash_add(CE_STATIC_MEMBERS(class_type), str_index, str_length, (void**)&q, sizeof(zval*), NULL); + ALLOC_ZVAL(r); + *r = **p; + INIT_PZVAL(r); + zval_copy_ctor(r); + zend_hash_add(CE_STATIC_MEMBERS(class_type), str_index, str_length, (void**)&r, sizeof(zval*), NULL); } zend_hash_move_forward_ex(&class_type->default_static_members, &pos); }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php