summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Zend/zend.c1
-rw-r--r--Zend/zend.h1
2 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend.c b/Zend/zend.c
index be0901c540..c732db54db 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -539,7 +539,6 @@ ZEND_API char *get_zend_version()
void zend_activate(TSRMLS_D)
{
- EG(bailout_set) = 0;
init_compiler(TSRMLS_C);
init_executor(TSRMLS_C);
startup_scanner(TSRMLS_C);
diff --git a/Zend/zend.h b/Zend/zend.h
index 090ae3c829..5d808bfd20 100644
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -356,6 +356,7 @@ END_EXTERN_C()
memcpy(&EG(bailout), &orig_bailout, sizeof(jmp_buf)); \
EG(bailout_set) = orig_bailout_set; \
}
+#define zend_first_try EG(bailout_set)=0; zend_try
ZEND_API char *get_zend_version(void);
ZEND_API void zend_make_printable_zval(zval *expr, zval *expr_copy, int *use_copy);