diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-04-01 22:27:42 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-04-01 22:27:42 +0800 |
| commit | 67476872cd837f620851808e02ac15301a5c619b (patch) | |
| tree | 73cb24c3889edadb047589acaf23e354f35efb83 /Zend/zend_execute_API.c | |
| parent | 7abfaac901684da8bdcbccf43682a5557085c917 (diff) | |
| parent | 5b1bb41c0b125fe9964abaa1d523ce2ba1823cf6 (diff) | |
| download | php-git-67476872cd837f620851808e02ac15301a5c619b.tar.gz | |
Merge branch 'PHP-7.0'
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index d88e199937..a4d82544f9 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -295,8 +295,8 @@ void shutdown_executor(void) /* {{{ */ } zend_stack_clean(&EG(user_error_handlers_error_reporting), NULL, 1); - zend_stack_clean(&EG(user_error_handlers), (void (*)(void *))ZVAL_DESTRUCTOR, 1); - zend_stack_clean(&EG(user_exception_handlers), (void (*)(void *))ZVAL_DESTRUCTOR, 1); + zend_stack_clean(&EG(user_error_handlers), (void (*)(void *))ZVAL_PTR_DTOR, 1); + zend_stack_clean(&EG(user_exception_handlers), (void (*)(void *))ZVAL_PTR_DTOR, 1); } zend_end_try(); zend_try { |