Fix build

diff --git a/TSRM/TSRM.h b/TSRM/TSRM.h
index ada8ab19e3dd5b256d907bca3f1d0741b9bff8fb..2e6c481d46318928f19066a385249786d6e46d4b 100644 (file)
--- a/TSRM/TSRM.h
+++ b/TSRM/TSRM.h
@@ -126,6 +126,14 @@ TSRM_API void *tsrm_set_new_thread_end_handler(void (*new_thread_end_handler)(TH
 }
 #endif
 
+#else
+
+#define TSRMLS_D
+#define TSRMLS_DC
+#define TSRMLS_C
+#define TSRMLS_CC
+#define TSRMLS_FETCH()
+
 #endif /* ZTS */
 
 #endif /* TSRM_H */

diff --git a/TSRM/tsrm_virtual_cwd.c b/TSRM/tsrm_virtual_cwd.c
index 3e12d943457d831cd556e171b10316a5916fca2f..2c899ee667ddc30a13e3049eb94f0608fb7eb85c 100644 (file)
--- a/TSRM/tsrm_virtual_cwd.c
+++ b/TSRM/tsrm_virtual_cwd.c
@@ -38,9 +38,7 @@
 
 #define VIRTUAL_CWD_DEBUG 0
 
-#ifdef ZTS
 #include "TSRM.h"
-#endif
 
 /* Only need mutex for popen() in Windows because it doesn't chdir() on UNIX */
 #if defined(TSRM_WIN32) && defined(ZTS)

diff --git a/Zend/zend.h b/Zend/zend.h
index 579813d35147699927c89248882152bf951ea162..89bebbcbaa0c7001a895365049b602dce20f7288 100644 (file)
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -23,6 +23,8 @@
 
 #define ZEND_VERSION "1.0.7"
 
+#include "../TSRM/TSRM.h"
+
 #ifdef __cplusplus
 #define BEGIN_EXTERN_C() extern "C" {
 #define END_EXTERN_C() }