mirror of
https://github.com/php/php-src.git
synced 2026-04-20 14:31:06 +02:00
Merge branch 'PHP-7.4'
* PHP-7.4: fix cross compilation failure due to size_t typecast in define
This commit is contained in:
@@ -27,12 +27,12 @@
|
||||
#include "zend.h"
|
||||
|
||||
#ifndef ZEND_MM_ALIGNMENT
|
||||
# define ZEND_MM_ALIGNMENT ((size_t) 8)
|
||||
# define ZEND_MM_ALIGNMENT Z_UL(8)
|
||||
# define ZEND_MM_ALIGNMENT_LOG2 Z_L(3)
|
||||
#elif ZEND_MM_ALIGNMENT < 4
|
||||
# undef ZEND_MM_ALIGNMENT
|
||||
# undef ZEND_MM_ALIGNMENT_LOG2
|
||||
# define ZEND_MM_ALIGNMENT ((size_t) 4)
|
||||
# define ZEND_MM_ALIGNMENT Z_UL(4)
|
||||
# define ZEND_MM_ALIGNMENT_LOG2 Z_L(2)
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user