com php-src: Fix word alignment on ILP64.: Zend/zend_alloc. c
| From: | Sara Golemon | Date: | Thu, 28 Sep 2017 14:45:51 +0000 |
| Subject: | com php-src: Fix word alignment on ILP64.: Zend/zend_alloc. c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-99573@lists.php.net to get a copy of this message | ||
Commit: b5bc88c64ef241924b55162f9b5dc751be7e10f1
Author: Sara Golemon <pollita@php.net> Thu, 28 Sep 2017 10:45:51 -0400
Parents: db9778dfb2485f220ba584d17e45a03760d10250
Branches: PHP-7.1 PHP-7.2 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b5bc88c64ef241924b55162f9b5dc751be7e10f1
Log:
Fix word alignment on ILP64.
Changed paths:
M Zend/zend_alloc.c
Diff:
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index b829bd3..baada8f 100644
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@ -283,7 +283,7 @@ struct _zend_mm_chunk {
uint32_t free_pages; /* number of free pages */
uint32_t free_tail; /* number of free pages at the end of chunk */
uint32_t num;
- char reserve[64 - (sizeof(void*) * 3 + sizeof(int) * 3)];
+ char reserve[64 - (sizeof(void*) * 3 + sizeof(uint32_t) * 3)];
zend_mm_heap heap_slot; /* used only in main chunk */
zend_mm_page_map free_map; /* 512 bits or 64 bytes */
zend_mm_page_info map[ZEND_MM_PAGES]; /* 2 KB = 512 * 4 */