From: Pierre Joye <pajoye@php.net>
Date: Fri, 9 Oct 2009 17:21:20 +0000 (+0000)
Subject: - Merge: don't hide early declaration
X-Git-Tag: php-5.3.1RC2~46
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=94655dc8d260b0d4a0d4662451373198ae67d1c7;p=php

- Merge: 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);
 			}