From: Dmitry Stogov <dmitry@php.net>
Date: Fri, 1 Dec 2006 15:33:20 +0000 (+0000)
Subject: Fixed bug #39702 (php crashes in the allocator on linux-m68k)
X-Git-Tag: RELEASE_1_0_0RC1~861
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fa6ab159a6b03cf36f48b955c8992c38a48abb5d;p=php

Fixed bug #39702 (php crashes in the allocator on linux-m68k)
---

diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index 460ce62ffe..7905ad4b82 100644
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@ -373,6 +373,11 @@ struct _zend_mm_heap {
 #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)