cvs: ZendEngine2 / zend.c zend_alloc.c zend_alloc.h

andi Tue Feb 26 14:17:29 2002 EDT Modified files: /ZendEngine2 zend.c zend_alloc.c zend_alloc.h Log: - MFZE1 Index: ZendEngine2/zend.c diff -u ZendEngine2/zend.c:1.162 ZendEngine2/zend.c:1.163 --- ZendEngine2/zend.c:1.162 Thu Feb 21 06:50:41 2002 +++ ZendEngine2/zend.c Tue Feb 26 14:17:24 2002 @@ -358,7 +358,7 @@ static void alloc_globals_dtor(zend_alloc_globals *alloc_globals_p TSRMLS_DC) { - shutdown_memory_manager(0, 1); + shutdown_memory_manager(0, 1 TSRMLS_CC); } Index: ZendEngine2/zend_alloc.c diff -u ZendEngine2/zend_alloc.c:1.94 ZendEngine2/zend_alloc.c:1.95 --- ZendEngine2/zend_alloc.c:1.94 Sun Jan 6 10:21:35 2002 +++ ZendEngine2/zend_alloc.c Tue Feb 26 14:17:25 2002 @@ -445,7 +445,7 @@ } -ZEND_API void shutdown_memory_manager(int silent, int clean_cache) +ZEND_API void shutdown_memory_manager(int silent, int clean_cache TSRMLS_DC) { zend_mem_header *p, *t; unsigned int fci, i, j; @@ -453,7 +453,6 @@ int had_leaks = 0; #endif zend_fast_cache_list_entry *fast_cache_list_entry, *next_fast_cache_list_entry; - TSRMLS_FETCH(); #if defined(ZEND_WIN32) && !ZEND_DEBUG if (clean_cache && AG(memory_heap)) { Index: ZendEngine2/zend_alloc.h diff -u ZendEngine2/zend_alloc.h:1.33 ZendEngine2/zend_alloc.h:1.34 --- ZendEngine2/zend_alloc.h:1.33 Sun Jan 6 10:21:35 2002 +++ ZendEngine2/zend_alloc.h Tue Feb 26 14:17:26 2002 @@ -115,7 +115,7 @@ ZEND_API int zend_set_memory_limit(unsigned int memory_limit); ZEND_API void start_memory_manager(TSRMLS_D); -ZEND_API void shutdown_memory_manager(int silent, int clean_cache); +ZEND_API void shutdown_memory_manager(int silent, int clean_cache TSRMLS_DC); #if ZEND_DEBUG ZEND_API int _mem_block_check(void *ptr, int silent ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);