cvs: ZendEngine2(PHP_5_2) / zend_alloc.c

From:	Dmitry Stogov	Date:	Fri, 01 Dec 2006 15:32:56 +0000
Subject:	cvs: ZendEngine2(PHP_5_2) / zend_alloc.c
Groups:	php.zend-engine.cvs

dmitry		Fri Dec  1 15:32:56 2006 UTC

  Modified files:              (Branch: PHP_5_2)
    /ZendEngine2	zend_alloc.c 
  Log:
  Fixed bug #39702 (php crashes in the allocator on linux-m68k)
  
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_alloc.c?r1=1.144.2.3.2.17&r2=1.144.2.3.2.18&diff_format=u
Index: ZendEngine2/zend_alloc.c
diff -u ZendEngine2/zend_alloc.c:1.144.2.3.2.17 ZendEngine2/zend_alloc.c:1.144.2.3.2.18
--- ZendEngine2/zend_alloc.c:1.144.2.3.2.17	Fri Dec  1 13:54:19 2006
+++ ZendEngine2/zend_alloc.c	Fri Dec  1 15:32:55 2006
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_alloc.c,v 1.144.2.3.2.17 2006/12/01 13:54:19 dmitry Exp $ */
+/* $Id: zend_alloc.c,v 1.144.2.3.2.18 2006/12/01 15:32:55 dmitry Exp $ */
 
 #include "zend.h"
 #include "zend_alloc.h"
@@ -373,6 +373,11 @@
 #ifndef ZEND_MM_ALIGNMENT
 # define ZEND_MM_ALIGNMENT 8
 # define ZEND_MM_ALIGNMENT_LOG2 3
+#elif ZEND_MM_ALIGNMENT < 4
+# undef ZEND_MM_ALIGNMENT
+# undef ZEND_MM_ALIGNMENT
+# define ZEND_MM_ALIGNMENT 4
+# define ZEND_MM_ALIGNMENT_LOG2 2
 #endif
 
 #define ZEND_MM_ALIGNMENT_MASK ~(ZEND_MM_ALIGNMENT-1)
@@ -587,6 +592,8 @@
 #if 0
 	int i;
 
+	printf("ZEND_MM_ALIGNMENT=%d\n", ZEND_MM_ALIGNMENT);
+	printf("ZEND_MM_ALIGNMENT_LOG2=%d\n", ZEND_MM_ALIGNMENT_LOG2);
 	printf("ZEND_MM_MIN_SIZE=%d\n", ZEND_MM_MIN_SIZE);
 	printf("ZEND_MM_MAX_SMALL_SIZE=%d\n", ZEND_MM_MAX_SMALL_SIZE);
 	printf("ZEND_MM_ALIGNED_HEADER_SIZE=%d\n", ZEND_MM_ALIGNED_HEADER_SIZE);