diff options
| author | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
| commit | 4b943c9c0dd4114adc78416c5241f11ad5c98a80 (patch) | |
| tree | c9628d91eae3f580f9ebd73d2372e4c9089b2e00 /ext/spl/spl_engine.h | |
| parent | 79354ba6d0d6a1a4596f9ac66ee9bc3a34ed972b (diff) | |
| parent | dec8eb431adee340fb8dfb9ff33ed29d3279c35f (diff) | |
| download | php-git-POST_NATIVE_TLS_MERGE.tar.gz | |
Merge remote-tracking branch 'origin/native-tls'POST_NATIVE_TLS_MERGE
Diffstat (limited to 'ext/spl/spl_engine.h')
| -rw-r--r-- | ext/spl/spl_engine.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/ext/spl/spl_engine.h b/ext/spl/spl_engine.h index 8fa5539ba5..5666033d75 100644 --- a/ext/spl/spl_engine.h +++ b/ext/spl/spl_engine.h @@ -25,41 +25,41 @@ #include "php_spl.h" #include "zend_interfaces.h" -PHPAPI void spl_instantiate(zend_class_entry *pce, zval *object TSRMLS_DC); +PHPAPI void spl_instantiate(zend_class_entry *pce, zval *object); -PHPAPI zend_long spl_offset_convert_to_long(zval *offset TSRMLS_DC); +PHPAPI zend_long spl_offset_convert_to_long(zval *offset); /* {{{ spl_instantiate_arg_ex1 */ -static inline int spl_instantiate_arg_ex1(zend_class_entry *pce, zval *retval, zval *arg1 TSRMLS_DC) +static inline int spl_instantiate_arg_ex1(zend_class_entry *pce, zval *retval, zval *arg1) { zend_function *func = pce->constructor; - spl_instantiate(pce, retval TSRMLS_CC); + spl_instantiate(pce, retval); - zend_call_method(retval, pce, &func, func->common.function_name->val, func->common.function_name->len, NULL, 1, arg1, NULL TSRMLS_CC); + zend_call_method(retval, pce, &func, func->common.function_name->val, func->common.function_name->len, NULL, 1, arg1, NULL); return 0; } /* }}} */ /* {{{ spl_instantiate_arg_ex2 */ -static inline int spl_instantiate_arg_ex2(zend_class_entry *pce, zval *retval, zval *arg1, zval *arg2 TSRMLS_DC) +static inline int spl_instantiate_arg_ex2(zend_class_entry *pce, zval *retval, zval *arg1, zval *arg2) { zend_function *func = pce->constructor; - spl_instantiate(pce, retval TSRMLS_CC); + spl_instantiate(pce, retval); - zend_call_method(retval, pce, &func, func->common.function_name->val, func->common.function_name->len, NULL, 2, arg1, arg2 TSRMLS_CC); + zend_call_method(retval, pce, &func, func->common.function_name->val, func->common.function_name->len, NULL, 2, arg1, arg2); return 0; } /* }}} */ /* {{{ spl_instantiate_arg_n */ -static inline void spl_instantiate_arg_n(zend_class_entry *pce, zval *retval, int argc, zval *argv TSRMLS_DC) +static inline void spl_instantiate_arg_n(zend_class_entry *pce, zval *retval, int argc, zval *argv) { zend_function *func = pce->constructor; zend_fcall_info fci; zend_fcall_info_cache fcc; zval dummy; - spl_instantiate(pce, retval TSRMLS_CC); + spl_instantiate(pce, retval); fci.size = sizeof(zend_fcall_info); fci.function_table = &pce->function_table; @@ -77,7 +77,7 @@ static inline void spl_instantiate_arg_n(zend_class_entry *pce, zval *retval, in fcc.called_scope = pce; fcc.object = Z_OBJ_P(retval); - zend_call_function(&fci, &fcc TSRMLS_CC); + zend_call_function(&fci, &fcc); } /* }}} */ |