- Support for always building TSRM into PHP

diff --git a/TSRM/TSRM.c b/TSRM/TSRM.c
index 5750bc7d4a09bb0a78a8cd99bbbdf7fe1d246619..04f746883f55ed9d803c2d36f3dcc284afb8f44b 100644 (file)
--- a/TSRM/TSRM.c
+++ b/TSRM/TSRM.c
@@ -11,6 +11,9 @@
 */
 
 #include "TSRM.h"
+
+#ifdef ZTS
+
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -455,3 +458,5 @@ void tsrm_debug_set(int status)
 {
        tsrm_debug_status = status;
 }
+
+#endif /* ZTS */

diff --git a/TSRM/TSRM.h b/TSRM/TSRM.h
index dbf5fbe898a8c5f3577562ff34f7b4c54f760fab..23dc73f8d2e1cc39b9c2ef8a3e81e71c5932efed 100644 (file)
--- a/TSRM/TSRM.h
+++ b/TSRM/TSRM.h
@@ -21,6 +21,9 @@
 # undef VERSION
 #endif
 
+/* Only compile multi-threading functions if we're in ZTS mode */
+#ifdef ZTS
+
 #if WIN32||WINNT
 # include <windows.h>
 #elif defined(GNUPTH)
@@ -104,4 +107,6 @@ TSRM_API void *tsrm_set_new_thread_end_handler(void (*new_thread_end_handler)(TH
 }
 #endif
 
+#endif /* ZTS */
+
 #endif /* TSRM_H */

diff --git a/TSRM/configure.in b/TSRM/configure.in
index 43171d8f5d5d7c90c9bf36a832a847b7ce59955b..3d46fdc5b1c6774ad3c6ab997ca17502f6191915 100644 (file)
--- a/TSRM/configure.in
+++ b/TSRM/configure.in
@@ -18,4 +18,6 @@ fi
 
 TSRM_PTHREAD
 
+AC_DEFINE(ZTS,1,[ ])
+
 AC_OUTPUT(Makefile)