summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sapi/embed/php_embed.h12
1 files changed, 9 insertions, 3 deletions
diff --git a/sapi/embed/php_embed.h b/sapi/embed/php_embed.h
index c3ee95d7e1..ab59ada1f0 100644
--- a/sapi/embed/php_embed.h
+++ b/sapi/embed/php_embed.h
@@ -32,18 +32,24 @@
#define PTSRMLS_DC , PTSRMLS_D
#define PTSRMLS_C &tsrm_ls
#define PTSRMLS_CC , PTSRMLS_C
+
+#define PHP_EMBED_START_BLOCK(x,y) { \
+ void ***tsrm_ls; \
+ php_embed_init(x, y PTSRMLS_CC); \
+ zend_first_try {
+
#else
#define PTSRMLS_D
#define PTSRMLS_DC
#define PTSRMLS_C
#define PTSRMLS_CC
-#endif
#define PHP_EMBED_START_BLOCK(x,y) { \
- void ***tsrm_ls; \
- php_embed_init(x, y PTSRMLS_CC); \
+ php_embed_init(x, y); \
zend_first_try {
+#endif
+
#define PHP_EMBED_END_BLOCK() \
} zend_catch { \
/* int exit_status = EG(exit_status); */ \