add some logic to detect zend_mm, which is really only useful when thread

safety support is enabled.

diff --git a/Zend/zend_mm.h b/Zend/zend_mm.h
index 98050c3b6594d66cc236695838701126916e4da5..279283bcc9c9e7caa9107fdf839628576c97377b 100644 (file)
--- a/Zend/zend_mm.h
+++ b/Zend/zend_mm.h
@@ -26,7 +26,13 @@
 
 #include "zend_types.h"
 
-/* Define this to enable Zend MM */
+#ifdef ZTS
+#define ZEND_MM
+#else
+#undef ZEND_MM
+#endif
+
+/* Zend MM is currently broken, so never use it. */
 #undef ZEND_MM
 
 /* mm block type */