From: Sascha Schumann <sas@php.net>
Date: Sat, 28 Jul 2001 00:46:42 +0000 (+0000)
Subject: Fix build
X-Git-Tag: PRE_ENGINE2_SPLIT~248
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6be787a9291ce572dd38b47594e069c67ee372aa;p=php

Fix build
---

diff --git a/TSRM/TSRM.h b/TSRM/TSRM.h
index ada8ab19e3..2e6c481d46 100644
--- 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 3e12d94345..2c899ee667 100644
--- 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 579813d351..89bebbcbaa 100644
--- 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() }