diff options
| author | Felipe Pena <felipe@php.net> | 2008-07-24 19:52:24 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2008-07-24 19:52:24 +0000 |
| commit | 0fbe6a0c14a7f8bc664484c33615d48a213ab662 (patch) | |
| tree | 0f7005c0598c1ff321dc3b22a2cf122e2956bbcc /Zend/zend_closures.c | |
| parent | ae8a21ad77cf23191b0d9635336330ad852953fd (diff) | |
| download | php-git-0fbe6a0c14a7f8bc664484c33615d48a213ab662.tar.gz | |
- MFH: Added TSRMLS_DC to apply_func_args_t and zend_hash_apply_with_arguments.
Diffstat (limited to 'Zend/zend_closures.c')
| -rw-r--r-- | Zend/zend_closures.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Zend/zend_closures.c b/Zend/zend_closures.c index e72df41f07..f478578c3e 100644 --- a/Zend/zend_closures.c +++ b/Zend/zend_closures.c @@ -243,13 +243,12 @@ void zend_register_closure_ce(TSRMLS_D) /* {{{ */ } /* }}} */ -static int zval_copy_static_var(zval **p, int num_args, va_list args, zend_hash_key *key) /* {{{ */ +static int zval_copy_static_var(zval **p TSRMLS_DC, int num_args, va_list args, zend_hash_key *key) /* {{{ */ { HashTable *target = va_arg(args, HashTable*); zend_bool is_ref; if (Z_TYPE_PP(p) & (IS_LEXICAL_VAR|IS_LEXICAL_REF)) { - TSRMLS_FETCH(); is_ref = Z_TYPE_PP(p) & IS_LEXICAL_REF; if (!EG(active_symbol_table)) { @@ -297,7 +296,7 @@ ZEND_API void zend_create_closure(zval *res, zend_function *func, zend_class_ent ALLOC_HASHTABLE(closure->func.op_array.static_variables); zend_hash_init(closure->func.op_array.static_variables, zend_hash_num_elements(static_variables), NULL, ZVAL_PTR_DTOR, 0); - zend_hash_apply_with_arguments(static_variables, (apply_func_args_t)zval_copy_static_var, 1, closure->func.op_array.static_variables); + zend_hash_apply_with_arguments(static_variables TSRMLS_CC, (apply_func_args_t)zval_copy_static_var, 1, closure->func.op_array.static_variables); } (*closure->func.op_array.refcount)++; } |