From: Pierre Joye Date: Sat, 5 Sep 2009 19:00:05 +0000 (+0000) Subject: - don't hide early declaration X-Git-Tag: php-5.3.2RC1~542 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7f36b2ead4f51ae5d6257191ae39ce5c3f4a9fdb;p=php - don't hide early declaration --- diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 729b13518f..d2824bfdc8 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -1038,13 +1038,13 @@ ZEND_API void zend_update_class_constants(zend_class_entry *class_type TSRMLS_DC 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); }