diff options
| author | Pierre Joye <pajoye@php.net> | 2009-10-09 17:21:20 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2009-10-09 17:21:20 +0000 |
| commit | 94655dc8d260b0d4a0d4662451373198ae67d1c7 (patch) | |
| tree | 5e87ff1902192b96080f8ebc46228b8e31ab09d6 /Zend/zend_API.c | |
| parent | 6392009183971700ffe25056ee05d82daf272898 (diff) | |
| download | php-git-94655dc8d260b0d4a0d4662451373198ae67d1c7.tar.gz | |
- Merge: don't hide early declaration
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 12 |
1 files changed, 6 insertions, 6 deletions
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); } |