diff options
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/zend.c | 2 | ||||
| -rw-r--r-- | Zend/zend_alloc.c | 3 | ||||
| -rw-r--r-- | Zend/zend_alloc.h | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index 67f498bd79..afeb01a628 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -358,7 +358,7 @@ static void alloc_globals_ctor(zend_alloc_globals *alloc_globals_p TSRMLS_DC) 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); } diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index a660bba33d..b24e31c2a1 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -445,7 +445,7 @@ 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) { zend_mem_header *p, *t; unsigned int fci, i, j; @@ -453,7 +453,6 @@ ZEND_API void shutdown_memory_manager(int silent, int clean_cache) 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)) { diff --git a/Zend/zend_alloc.h b/Zend/zend_alloc.h index b799961f0d..c89fbfd04a 100644 --- a/Zend/zend_alloc.h +++ b/Zend/zend_alloc.h @@ -115,7 +115,7 @@ ZEND_API int _persist_alloc(void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC); 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); |