- Fix build without ZTS. If someone has a nicer fix let me know.

diff --git a/Zend/zend_ts_hash.c b/Zend/zend_ts_hash.c
index 8d9cc3c99e8b49332c06dd2342f9398866a44178..8fe36d32356bfb84fe6783a735612a2b138fb487 100644 (file)
--- a/Zend/zend_ts_hash.c
+++ b/Zend/zend_ts_hash.c
@@ -16,8 +16,9 @@
    +----------------------------------------------------------------------+
 */
 
-#include "zend_ts_hash.h"
+#ifdef ZTS
 
+#include "zend_ts_hash.h"
 
 /* ts management functions */
 static void begin_read(TsHashTable *ht)
@@ -336,4 +337,6 @@ void zend_ts_hash_display(TsHashTable *ht)
        zend_hash_display(&(ht->hash));
        end_read(ht);
 }
-#endif
\ No newline at end of file
+#endif
+
+#endif /* ZTS */

diff --git a/Zend/zend_ts_hash.h b/Zend/zend_ts_hash.h
index 51472297df4a4bec56f18cc097e8bd731f91c801..abd8e032dadee07a7c16cca383f1cd172cb71e84 100644 (file)
--- a/Zend/zend_ts_hash.h
+++ b/Zend/zend_ts_hash.h
@@ -19,6 +19,8 @@
 #ifndef ZEND_TS_HASH_H
 #define ZEND_TS_HASH_H
 
+#ifdef ZTS
+
 #include "zend.h"
 
 typedef struct _zend_ts_hashtable {
@@ -112,4 +114,6 @@ END_EXTERN_C()
        zend_ts_hash_init(ht, n, NULL, ZVAL_PTR_DTOR, persistent)
 
 
+#endif /* ZTS */
+
 #endif                                                 /* ZEND_HASH_H */