Use size_t instead

Author: Girgias

Zend/zend_alloc.c

@@ -1319,7 +1319,7 @@ static zend_always_inline void *zend_mm_alloc_heap(zend_mm_heap *heap, size_t si
 	size = MAX(size, 1);
 	size = ZEND_MM_ALIGNED_SIZE(size) + ZEND_MM_ALIGNED_SIZE(sizeof(zend_mm_debug_info));
 	if (UNEXPECTED(size < real_size)) {
-		zend_error_noreturn(E_ERROR, "Possible integer overflow in memory allocation ("ZEND_ULONG_FMT" + "ZEND_ULONG_FMT")", ZEND_MM_ALIGNED_SIZE(real_size), ZEND_MM_ALIGNED_SIZE(sizeof(zend_mm_debug_info)));
+		zend_error_noreturn(E_ERROR, "Possible integer overflow in memory allocation (%zu + %zu)", ZEND_MM_ALIGNED_SIZE(real_size), ZEND_MM_ALIGNED_SIZE(sizeof(zend_mm_debug_info)));
 		return NULL;
 	}
 #endif

Zend/zend_alloc.h

@@ -27,14 +27,14 @@
 #include "zend.h"
 
 #ifndef CONFIG_ZEND_MM_ALIGNMENT
-# define ZEND_MM_ALIGNMENT Z_UL(8)
-# define ZEND_MM_ALIGNMENT_LOG2 Z_UL(3)
+# define ZEND_MM_ALIGNMENT (size_t)8
+# define ZEND_MM_ALIGNMENT_LOG2 (size_t)3
 #elif ZEND_MM_ALIGNMENT < 4
-# define ZEND_MM_ALIGNMENT Z_UL(4)
-# define ZEND_MM_ALIGNMENT_LOG2 Z_UL(2)
+# define ZEND_MM_ALIGNMENT (size_t)4
+# define ZEND_MM_ALIGNMENT_LOG2 (size_t)2
 #else
-# define ZEND_MM_ALIGNMENT Z_UL(CONFIG_ZEND_MM_ALIGNMENT)
-# define ZEND_MM_ALIGNMENT_LOG2 Z_UL(CONFIG_ZEND_MM_ALIGNMENT_LOG2)
+# define ZEND_MM_ALIGNMENT (size_t)CONFIG_ZEND_MM_ALIGNMENT
+# define ZEND_MM_ALIGNMENT_LOG2 (size_t)CONFIG_ZEND_MM_ALIGNMENT_LOG2
 #endif
 
 #define ZEND_MM_ALIGNMENT_MASK ~(ZEND_MM_ALIGNMENT - 1)