summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPascal de Bruijn <pmjdebruijn@pcode.nl>2020-01-30 13:48:44 +0100
committerNikita Popov <nikita.ppv@gmail.com>2020-01-30 15:51:54 +0100
commitf0f5c415a6e0abc40514f97113deb52a343174ee (patch)
tree4dabacdabf8bfa3c8143381922633f943dca0bbc
parentf70b552326e5242655d6ac2c55ca220e89afef34 (diff)
downloadphp-git-f0f5c415a6e0abc40514f97113deb52a343174ee.tar.gz
fix cross compilation failure due to size_t typecast in define
The following commit introduces a cross-compilation failure: 93c728b77cfb47f5cfdd1863f8982ea59d344205 "Try to control ZEND_MM_ALIGNED_SIZE type" br-arm-full/build/php-7.4.2/Zend/zend_alloc.h:30:38: error: missing binary operator before token "8" ^ br-arm-full/build/php-7.4.2/ext/opcache/ZendAccelerator.c:1380:7: note: in expansion of macro ‘ZEND_MM_ALIGNMENT’ Closes GH-5128.
-rw-r--r--Zend/zend_alloc.h4
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