diff options
| author | Dmitry Stogov <dmitry@php.net> | 2007-11-06 12:06:05 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2007-11-06 12:06:05 +0000 |
| commit | c3c5d27fbc5146d6b3dd58380fa422000c64fb95 (patch) | |
| tree | 8783e93f4c750d4e4f7aa7f7177a00c881fc3066 /Zend/zend_alloc.c | |
| parent | fb7306822dad57f4b6972ebefeffbbcdfbb57894 (diff) | |
| download | php-git-c3c5d27fbc5146d6b3dd58380fa422000c64fb95.tar.gz | |
Fixed windows build (Rob)
Diffstat (limited to 'Zend/zend_alloc.c')
| -rw-r--r-- | Zend/zend_alloc.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index efa8ec7893..f491620dee 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -403,9 +403,9 @@ typedef struct _zend_mm_free_block { struct _zend_mm_heap { int use_zend_alloc; - void *(*malloc)(size_t); - void (*free)(void*); - void *(*realloc)(void*, size_t); + void *(*_malloc)(size_t); + void (*_free)(void*); + void *(*_realloc)(void*, size_t); size_t free_bitmap; size_t large_free_bitmap; size_t block_size; @@ -2267,7 +2267,7 @@ ZEND_API void *_emalloc(size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) TSRMLS_FETCH(); if (UNEXPECTED(!AG(mm_heap)->use_zend_alloc)) { - return AG(mm_heap)->malloc(size); + return AG(mm_heap)->_malloc(size); } return _zend_mm_alloc_int(AG(mm_heap), size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); } @@ -2277,7 +2277,7 @@ ZEND_API void _efree(void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) TSRMLS_FETCH(); if (UNEXPECTED(!AG(mm_heap)->use_zend_alloc)) { - AG(mm_heap)->free(ptr); + AG(mm_heap)->_free(ptr); return; } _zend_mm_free_int(AG(mm_heap), ptr ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); @@ -2288,7 +2288,7 @@ ZEND_API void *_erealloc(void *ptr, size_t size, int allow_failure ZEND_FILE_LIN TSRMLS_FETCH(); if (UNEXPECTED(!AG(mm_heap)->use_zend_alloc)) { - return AG(mm_heap)->realloc(ptr, size); + return AG(mm_heap)->_realloc(ptr, size); } return _zend_mm_realloc_int(AG(mm_heap), ptr, size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); } @@ -2456,9 +2456,9 @@ static void alloc_globals_ctor(zend_alloc_globals *alloc_globals TSRMLS_DC) if (tmp) { alloc_globals->mm_heap->use_zend_alloc = zend_atoi(tmp, 0); if (!alloc_globals->mm_heap->use_zend_alloc) { - alloc_globals->mm_heap->malloc = malloc; - alloc_globals->mm_heap->free = free; - alloc_globals->mm_heap->realloc = realloc; + alloc_globals->mm_heap->_malloc = malloc; + alloc_globals->mm_heap->_free = free; + alloc_globals->mm_heap->_realloc = realloc; } } } @@ -2494,14 +2494,14 @@ ZEND_API zend_mm_storage *zend_mm_get_storage(zend_mm_heap *heap) } ZEND_API void zend_mm_set_custom_handlers(zend_mm_heap *heap, - void* (*malloc)(size_t), - void (*free)(void*), - void* (realloc)(void*, size_t)) + void* (*_malloc)(size_t), + void (*_free)(void*), + void* (*_realloc)(void*, size_t)) { heap->use_zend_alloc = 0; - heap->malloc = malloc; - heap->free = free; - heap->realloc = realloc; + heap->_malloc = _malloc; + heap->_free = _free; + heap->_realloc = _realloc; } #if ZEND_DEBUG |