diff options
| author | Xinchen Hui <laruence@php.net> | 2014-07-19 17:19:57 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-07-19 17:19:57 +0800 |
| commit | 1c0e22f50c70cdcd62c4b8ccae0ca5ecd7c0ad26 (patch) | |
| tree | 1d85b97c059b2f09ab3611dd9d0390b62b2b18d9 /Zend/zend_compile.h | |
| parent | a3e8a1091879dbea294f0398941acaa6abdb0af5 (diff) | |
| parent | 1d2f232bd29dd29045c7389cf9d23b1ad2fd4db8 (diff) | |
| download | php-git-1c0e22f50c70cdcd62c4b8ccae0ca5ecd7c0ad26.tar.gz | |
Merge branch 'PHP-5.6'
Diffstat (limited to 'Zend/zend_compile.h')
| -rw-r--r-- | Zend/zend_compile.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index b4ecf6f51d..f86a41ae2b 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -864,8 +864,8 @@ int zend_add_literal(zend_op_array *op_array, const zval *zv TSRMLS_DC); #define ZEND_FAST_RET_TO_CATCH 1 #define ZEND_FAST_RET_TO_FINALLY 2 -#define ZEND_FAST_CALL_FOR_CATCH 1 -#define ZEND_FAST_CALL_FOR_FINALLY 2 +#define ZEND_FAST_CALL_FROM_CATCH 1 +#define ZEND_FAST_CALL_FROM_FINALLY 2 END_EXTERN_C() |