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_builtin_functions.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_builtin_functions.c')
| -rw-r--r-- | Zend/zend_builtin_functions.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index 5680646092..b23ee3a533 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -1628,7 +1628,7 @@ ZEND_FUNCTION(restore_exception_handler) /* }}} */ -static int copy_class_or_interface_name(zend_class_entry **pce, int num_args, va_list args, zend_hash_key *hash_key) +static int copy_class_or_interface_name(zend_class_entry **pce TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key) { zval *array = va_arg(args, zval *); zend_uint mask = va_arg(args, zend_uint); @@ -1656,7 +1656,7 @@ ZEND_FUNCTION(get_declared_classes) } array_init(return_value); - zend_hash_apply_with_arguments(EG(class_table), (apply_func_args_t) copy_class_or_interface_name, 3, return_value, mask, comply); + zend_hash_apply_with_arguments(EG(class_table) TSRMLS_CC, (apply_func_args_t) copy_class_or_interface_name, 3, return_value, mask, comply); } /* }}} */ @@ -1672,12 +1672,12 @@ ZEND_FUNCTION(get_declared_interfaces) } array_init(return_value); - zend_hash_apply_with_arguments(EG(class_table), (apply_func_args_t) copy_class_or_interface_name, 3, return_value, mask, comply); + zend_hash_apply_with_arguments(EG(class_table) TSRMLS_CC, (apply_func_args_t) copy_class_or_interface_name, 3, return_value, mask, comply); } /* }}} */ -static int copy_function_name(zend_function *func, int num_args, va_list args, zend_hash_key *hash_key) +static int copy_function_name(zend_function *func TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key) { zval *internal_ar = va_arg(args, zval *), *user_ar = va_arg(args, zval *); @@ -1714,7 +1714,7 @@ ZEND_FUNCTION(get_defined_functions) array_init(user); array_init(return_value); - zend_hash_apply_with_arguments(EG(function_table), (apply_func_args_t) copy_function_name, 2, internal, user); + zend_hash_apply_with_arguments(EG(function_table) TSRMLS_CC, (apply_func_args_t) copy_function_name, 2, internal, user); if (zend_hash_add(Z_ARRVAL_P(return_value), "internal", sizeof("internal"), (void **)&internal, sizeof(zval *), NULL) == FAILURE) { zval_ptr_dtor(&internal); |