diff options
| author | Anatol Belski <ab@php.net> | 2013-03-19 14:44:20 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2013-03-19 14:44:20 +0100 |
| commit | 6f0f5d5281f4311dc4254b917ba185bacb659add (patch) | |
| tree | 77a06e393edea9ae4cebaad0388bd31f0904d36b | |
| parent | 4837bdb91049e47e0c15873a2d1d4d1f7a4c65d2 (diff) | |
| parent | 7687b8b81c599b0374cb902e9dd812d2cfc12efd (diff) | |
| download | php-git-6f0f5d5281f4311dc4254b917ba185bacb659add.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix C90 compat
| -rw-r--r-- | Zend/zend_API.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 18e7a36c96..1f400dea13 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -1068,9 +1068,10 @@ static int zval_update_class_constant(zval **pp, int is_static, int offset TSRML zend_hash_move_forward_ex(&ce->properties_info, &pos)) { if (is_static == ((prop_info->flags & ZEND_ACC_STATIC) != 0) && offset == prop_info->offset) { + int ret; zend_class_entry *old_scope = *scope; *scope = prop_info->ce; - int ret = zval_update_constant(pp, (void*)1 TSRMLS_CC); + ret = zval_update_constant(pp, (void*)1 TSRMLS_CC); *scope = old_scope; return ret; } |