summaryrefslogtreecommitdiff
path: root/Zend
diff options
context:
space:
mode:
Diffstat (limited to 'Zend')
-rw-r--r--Zend/zend.c1
-rw-r--r--Zend/zend_compile.h5
2 files changed, 5 insertions, 1 deletions
diff --git a/Zend/zend.c b/Zend/zend.c
index d0f9418f20..b6f81a69cc 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -227,7 +227,6 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions)
zend_compiler_globals *compiler_globals;
zend_executor_globals *executor_globals;
- tsrm_startup(1,1,0);
alloc_globals_id = ts_allocate_id(sizeof(zend_alloc_globals), alloc_globals_ctor, NULL);
#endif
diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
index f1d87bc650..9faeee03c7 100644
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@ -28,7 +28,12 @@
#include "zend-parser.h"
#define DEBUG_ZEND 0
+
+#ifndef ZTS
#define SUPPORT_INTERACTIVE 1
+#else
+#define SUPPORT_INTERACTIVE 0
+#endif
#define FREE_PNODE(znode) zval_dtor(&znode->u.constant);
#define FREE_OP(op, should_free) if (should_free) zval_dtor(&Ts[(op)->u.var].tmp_var);