diff options
| author | Sara Golemon <pollita@php.net> | 2017-09-28 10:48:43 -0400 |
|---|---|---|
| committer | Sara Golemon <pollita@php.net> | 2017-09-28 10:48:43 -0400 |
| commit | a93fe32c1afad44ddcc1e67c3b65a2a6a16c7158 (patch) | |
| tree | 01123157954d4fe8142198a1971203dcb4005af5 | |
| parent | 4f1ea03528c795b0c08cfbdfdf4a02cf6a33042d (diff) | |
| parent | b5bc88c64ef241924b55162f9b5dc751be7e10f1 (diff) | |
| download | php-git-a93fe32c1afad44ddcc1e67c3b65a2a6a16c7158.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix word alignment on ILP64.
| -rw-r--r-- | Zend/zend_alloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index 28c65312e6..1cebd9950f 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 */ |