diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-01-30 15:52:22 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-01-30 15:52:22 +0100 |
| commit | 981fdd9f51b352045f9b1f2cdc650f0f5dd9695c (patch) | |
| tree | 4f0d927fcd365199f78d03ffe9bbcd9adf027039 | |
| parent | ca8657a2b502791b1ec0587948741098ca82e314 (diff) | |
| parent | f0f5c415a6e0abc40514f97113deb52a343174ee (diff) | |
| download | php-git-981fdd9f51b352045f9b1f2cdc650f0f5dd9695c.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
fix cross compilation failure due to size_t typecast in define
| -rw-r--r-- | Zend/zend_alloc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_alloc.h b/Zend/zend_alloc.h index c5838f2ac6..8bb854328d 100644 --- a/Zend/zend_alloc.h +++ b/Zend/zend_alloc.h @@ -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 |