summaryrefslogtreecommitdiff
path: root/TSRM
diff options
context:
space:
mode:
authorSascha Schumann <sas@php.net>2001-07-28 00:46:42 +0000
committerSascha Schumann <sas@php.net>2001-07-28 00:46:42 +0000
commit6be787a9291ce572dd38b47594e069c67ee372aa (patch)
tree17ac6aa7066d7c7f1bb8c1740d58f46bb2c02c5a /TSRM
parent30892690b31348ab358cbe43d6a4b1042752f4aa (diff)
downloadphp-git-6be787a9291ce572dd38b47594e069c67ee372aa.tar.gz
Fix build
Diffstat (limited to 'TSRM')
-rw-r--r--TSRM/TSRM.h8
-rw-r--r--TSRM/tsrm_virtual_cwd.c2
2 files changed, 8 insertions, 2 deletions
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)