Bug#401129: [php-maint] Bug#401129: [m68k] FTBFS due to alignment problem

[sean finney]

hi roman,

On Fri, 2006-12-01 at 17:40 +0100, Roman Zippel wrote:
> Hi,
> 
> Here is also how it's officially fixed now in CVS:
> 
> http://news.php.net/php.zend-engine.cvs/5437
> 
> Please release a new package with this patch.

erm...

@@ -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)


is it me or should that second undef be replaced with ZEND_MM_ALIGNMENT_LOG2 ?



	sean
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: This is a digitally signed message part
Url : http://lists.alioth.debian.org/pipermail/pkg-php-maint/attachments/20061201/e973daa1/attachment.pgp