diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2016-09-24 18:05:21 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2016-09-24 18:05:21 +0200 |
| commit | bc22582cf7c8782a75e24395af23170d2c4400a7 (patch) | |
| tree | da65762ad05053e4c16d96df9f1bf4f6f4d1407f | |
| parent | 8831a12da1671bcfca8607d5af505d69ba938917 (diff) | |
| parent | c596b02a5b451ad95987f7a8c86b0ba313efa5a8 (diff) | |
| download | php-git-bc22582cf7c8782a75e24395af23170d2c4400a7.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
| -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 a79d67b4b9..8861d00874 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -2646,9 +2646,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 |