diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2016-09-24 17:52:15 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2016-09-24 17:52:15 +0200 |
| commit | c596b02a5b451ad95987f7a8c86b0ba313efa5a8 (patch) | |
| tree | 7ba224f9aea7da0109a812d440bab2391fdcaac5 | |
| parent | 8f5eda4bf62ca0e1ba6459b42fb5c0b629774cb2 (diff) | |
| parent | 5880428dac00ff9bafccb8c10c7226d6fa1dabbb (diff) | |
| download | php-git-c596b02a5b451ad95987f7a8c86b0ba313efa5a8.tar.gz | |
Merge branch 'pull-request/2120' into PHP-5.6
| -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 1f00414939..c7babe12b7 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -2735,9 +2735,9 @@ static void alloc_globals_ctor(zend_alloc_globals *alloc_globals TSRMLS_DC) alloc_globals->mm_heap = malloc(sizeof(struct _zend_mm_heap)); memset(alloc_globals->mm_heap, 0, sizeof(struct _zend_mm_heap)); alloc_globals->mm_heap->use_zend_alloc = 0; - alloc_globals->mm_heap->_malloc = malloc; + alloc_globals->mm_heap->_malloc = __zend_malloc; alloc_globals->mm_heap->_free = free; - alloc_globals->mm_heap->_realloc = realloc; + alloc_globals->mm_heap->_realloc = __zend_realloc; } else { alloc_globals->mm_heap = zend_mm_startup(); } |