diff options
| author | Xinchen Hui <laruence@gmail.com> | 2018-01-16 14:54:05 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2018-01-16 14:54:05 +0800 |
| commit | ff6a9d1f10eae8653c918d72d5cdd8e676dd4265 (patch) | |
| tree | 35641078ff510bde6cc0513dfb4cc399a3a7a5c6 /Zend | |
| parent | 3a3e0493d02d89379fc0fe2f74aae41e770d2db8 (diff) | |
| parent | d6881293603e1f4e7f073345e1028ce514b33457 (diff) | |
| download | php-git-ff6a9d1f10eae8653c918d72d5cdd8e676dd4265.tar.gz | |
Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src:
Removed recursive call
Put ZEND_FASTCALL into the proper place.
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/zend_generators.c | 1 | ||||
| -rw-r--r-- | Zend/zend_variables.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c index 963ac08c82..9a8a1e195d 100644 --- a/Zend/zend_generators.c +++ b/Zend/zend_generators.c @@ -1061,7 +1061,6 @@ static void zend_generator_iterator_dtor(zend_object_iterator *iterator) /* {{{ zend_generator *generator = (zend_generator*)Z_OBJ(iterator->data); generator->iterator = NULL; zval_ptr_dtor(&iterator->data); - zend_iterator_dtor(iterator); } /* }}} */ diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c index f612a4836d..f92a500dbd 100644 --- a/Zend/zend_variables.c +++ b/Zend/zend_variables.c @@ -44,7 +44,7 @@ static void ZEND_FASTCALL zend_ast_ref_destroy_wrapper(zend_ast_ref *ast ZEND_FI # define zend_ast_ref_destroy_wrapper zend_ast_ref_destroy #endif -typedef void ZEND_FASTCALL (*zend_zval_dtor_func_t)(zend_refcounted *p); +typedef void (ZEND_FASTCALL *zend_zval_dtor_func_t)(zend_refcounted *p); static const zend_zval_dtor_func_t zend_zval_dtor_func[] = { /* IS_UNDEF */ (zend_zval_dtor_func_t)zend_empty_destroy, |