diff options
| author | Xinchen Hui <laruence@php.net> | 2012-08-25 21:49:29 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-08-25 21:50:08 +0800 |
| commit | 383eafe482d0e07e6bc8a6b5c1dccb69a9f17bb7 (patch) | |
| tree | f1681ec2bca52aa79c78343b9b130c28c0a7d241 /Zend/zend_vm_execute.skl | |
| parent | 4c83ecc75452a23799c39f9bbb95b617fa46bf84 (diff) | |
| parent | d92a89fe52e89eef9527d1e27b5bb051ae24bc54 (diff) | |
| download | php-git-383eafe482d0e07e6bc8a6b5c1dccb69a9f17bb7.tar.gz | |
Merge branch 'PHP-5.3' into 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 426f689795..6d1b2e70e7 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%} |