diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2016-09-24 18:18:34 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2016-09-24 18:18:34 +0200 |
| commit | 75a1384ebfe9edd3153a329cf8501ef6f635e22a (patch) | |
| tree | c5c8b046d1f66b23b265cd1701bbe49a21fa21f0 /Zend/zend_alloc.c | |
| parent | 453102b4a0cb02e880bb7b568d71f24acde4246e (diff) | |
| parent | bc22582cf7c8782a75e24395af23170d2c4400a7 (diff) | |
| download | php-git-75a1384ebfe9edd3153a329cf8501ef6f635e22a.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
Diffstat (limited to 'Zend/zend_alloc.c')
| -rw-r--r-- | Zend/zend_alloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index 1d04646f07..439801f3dd 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -2602,9 +2602,9 @@ static void alloc_globals_ctor(zend_alloc_globals *alloc_globals) alloc_globals->mm_heap = malloc(sizeof(zend_mm_heap)); memset(alloc_globals->mm_heap, 0, sizeof(zend_mm_heap)); alloc_globals->mm_heap->use_custom_heap = ZEND_MM_CUSTOM_HEAP_STD; - alloc_globals->mm_heap->custom_heap.std._malloc = malloc; + alloc_globals->mm_heap->custom_heap.std._malloc = __zend_malloc; alloc_globals->mm_heap->custom_heap.std._free = free; - alloc_globals->mm_heap->custom_heap.std._realloc = realloc; + alloc_globals->mm_heap->custom_heap.std._realloc = __zend_realloc; return; } #endif |