diff options
| author | Xinchen Hui <laruence@php.net> | 2014-07-18 15:52:52 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-07-18 16:25:43 +0800 |
| commit | 110bf9c720d02b49a1a5d0c6e8affe65f9aa01db (patch) | |
| tree | 9d377d071e33efcbbc3c60f3218a557216edfd71 /Zend/zend_compile.h | |
| parent | 4e378844abbfbc7fec88d063ee0bf2e9026b6b6a (diff) | |
| parent | f6f621ef69a5a9bf20e94c2714bdebae73860927 (diff) | |
| download | php-git-110bf9c720d02b49a1a5d0c6e8affe65f9aa01db.tar.gz | |
Merge remote-tracking branch 'origin/master' into phpng
Conflicts:
Zend/zend_compile.h
ext/openssl/xp_ssl.c
Diffstat (limited to 'Zend/zend_compile.h')
| -rw-r--r-- | Zend/zend_compile.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 3124c35208..a838a58144 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -840,6 +840,9 @@ int zend_add_literal(zend_op_array *op_array, 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_ARRAY_ELEMENT_REF (1<<0) #define ZEND_ARRAY_NOT_PACKED (1<<1) #define ZEND_ARRAY_SIZE_SHIFT 2 |