From 93c728b77cfb47f5cfdd1863f8982ea59d344205 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 12 Jun 2019 13:06:48 +0200 Subject: [PATCH] Try to control ZEND_MM_ALIGNED_SIZE type --- Zend/zend_alloc.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Zend/zend_alloc.h b/Zend/zend_alloc.h index 075aac6561..c5838f2ac6 100644 --- a/Zend/zend_alloc.h +++ b/Zend/zend_alloc.h @@ -27,21 +27,21 @@ #include "zend.h" #ifndef ZEND_MM_ALIGNMENT -# define ZEND_MM_ALIGNMENT Z_L(8) +# define ZEND_MM_ALIGNMENT ((size_t) 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 Z_L(4) +# define ZEND_MM_ALIGNMENT ((size_t) 4) # define ZEND_MM_ALIGNMENT_LOG2 Z_L(2) #endif -#define ZEND_MM_ALIGNMENT_MASK ~(ZEND_MM_ALIGNMENT - Z_L(1)) +#define ZEND_MM_ALIGNMENT_MASK ~(ZEND_MM_ALIGNMENT - 1) -#define ZEND_MM_ALIGNED_SIZE(size) (((size) + ZEND_MM_ALIGNMENT - Z_L(1)) & ZEND_MM_ALIGNMENT_MASK) +#define ZEND_MM_ALIGNED_SIZE(size) (((size) + ZEND_MM_ALIGNMENT - 1) & ZEND_MM_ALIGNMENT_MASK) #define ZEND_MM_ALIGNED_SIZE_EX(size, alignment) \ - (((size) + ((alignment) - Z_L(1))) & ~((alignment) - Z_L(1))) + (((size) + ((alignment) - 1)) & ~((alignment) - 1)) typedef struct _zend_leak_info { void *addr; -- 2.50.1