Browse Source

- Oops, this was supposed to be part of the previous #ifdef ZEND_MM change

experimental/new_apache_hooks
Andi Gutmans 24 years ago
parent
commit
ad9bed0edd
  1. 6
      Zend/zend_alloc.c

6
Zend/zend_alloc.c

@ -40,7 +40,7 @@ ZEND_API zend_alloc_globals alloc_globals;
#define ZEND_DISABLE_MEMORY_CACHE 0
#if ZEND_MM
#ifdef ZEND_MM
#define ZEND_DO_MALLOC(size) zend_mm_alloc(&AG(mm_heap), size)
#define ZEND_DO_FREE(ptr) zend_mm_free(&AG(mm_heap), ptr)
#define ZEND_DO_REALLOC(ptr, size) zend_mm_realloc(&AG(mm_heap), ptr, size)
@ -420,7 +420,7 @@ ZEND_API void start_memory_manager(TSRMLS_D)
memset(AG(fast_cache_list_head), 0, sizeof(AG(fast_cache_list_head)));
memset(AG(cache_count), 0, sizeof(AG(cache_count)));
#if ZEND_MM
#ifdef ZEND_MM
zend_mm_startup(&AG(mm_heap), 256*1024);
#elif defined(ZEND_WIN32)
AG(memory_heap) = HeapCreate(HEAP_NO_SERIALIZE, 256*1024, 0);
@ -461,7 +461,7 @@ ZEND_API void shutdown_memory_manager(int silent, int clean_cache TSRMLS_DC)
#endif
zend_fast_cache_list_entry *fast_cache_list_entry, *next_fast_cache_list_entry;
#if ZEND_MM
#ifdef ZEND_MM
zend_mm_shutdown(&AG(mm_heap));
return;
#elif defined(ZEND_WIN32) && !ZEND_DEBUG

Loading…
Cancel
Save