- Don't support interactive mode when thread safe.

diff --git a/Zend/zend.c b/Zend/zend.c
index d0f9418f202062c63e39078126a5719e72b4e699..b6f81a69cc7c850c420d908ab4c9ded53b9020be 100644 (file)
--- 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 f1d87bc650fb0bd26f86a4b10cf9a65f8a5abe1f..9faeee03c77c1db83d9a5146684d8666d674524c 100644 (file)
--- 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);