diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2014-04-11 19:35:11 +0200 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2014-04-11 19:35:11 +0200 |
| commit | ccf863c8ce7e746948fb060d515960492c41ed27 (patch) | |
| tree | e6afced5ad30a68279ecf5801e7aca1e42f4ae4c /Zend/zend_API.c | |
| parent | 38ec4d20bfc109a12008fe6f0ec173bb5c09da3d (diff) | |
| parent | 99d1a1bb3f96364d1ee7bf3e9c84215001200112 (diff) | |
| download | php-git-ccf863c8ce7e746948fb060d515960492c41ed27.tar.gz | |
Merge branch 'PHP-5.6'
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 76988601b3..2d845d357e 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -1070,7 +1070,7 @@ static int zval_update_class_constant(zval **pp, int is_static, int offset TSRML int ret; zend_class_entry *old_scope = *scope; *scope = prop_info->ce; - ret = zval_update_constant(pp, (void*)1 TSRMLS_CC); + ret = zval_update_constant(pp, 1 TSRMLS_CC); *scope = old_scope; return ret; } @@ -1079,7 +1079,7 @@ static int zval_update_class_constant(zval **pp, int is_static, int offset TSRML } while (ce); } - return zval_update_constant(pp, (void*)1 TSRMLS_CC); + return zval_update_constant(pp, 1 TSRMLS_CC); } return 0; } @@ -1093,7 +1093,7 @@ ZEND_API void zend_update_class_constants(zend_class_entry *class_type TSRMLS_DC int i; *scope = class_type; - zend_hash_apply_with_argument(&class_type->constants_table, (apply_func_arg_t) zval_update_constant, (void*)1 TSRMLS_CC); + zend_hash_apply_with_argument(&class_type->constants_table, (apply_func_arg_t) zval_update_constant, (void *)1 TSRMLS_CC); for (i = 0; i < class_type->default_properties_count; i++) { if (class_type->default_properties_table[i]) { |