diff options
| author | Xinchen Hui <laruence@php.net> | 2012-08-25 21:55:36 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-08-25 21:55:36 +0800 |
| commit | e888d48d9ba9adbd37d8c102c40b90bedf20ca7a (patch) | |
| tree | adaf6261654bd1f0be2169133cc07ca1787b5bf6 /Zend/zend_vm_execute.skl | |
| parent | 326aa087532d7eaecc8fefff58bb2a0b008b5ac8 (diff) | |
| parent | 383eafe482d0e07e6bc8a6b5c1dccb69a9f17bb7 (diff) | |
| download | php-git-e888d48d9ba9adbd37d8c102c40b90bedf20ca7a.tar.gz | |
Merge branch 'PHP-5.4'
Diffstat (limited to 'Zend/zend_vm_execute.skl')
| -rw-r--r-- | Zend/zend_vm_execute.skl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_vm_execute.skl b/Zend/zend_vm_execute.skl index f5d0b7879a..0c5e8a3c9c 100644 --- a/Zend/zend_vm_execute.skl +++ b/Zend/zend_vm_execute.skl @@ -5,8 +5,8 @@ ZEND_API void {%EXECUTOR_NAME%}(zend_op_array *op_array TSRMLS_DC) DCL_OPLINE zend_execute_data *execute_data; zend_bool nested = 0; - zend_bool original_in_execution = EG(in_execution); {%HELPER_VARS%} + {%EXECUTION_STATUS%} {%INTERNAL_LABELS%} |