diff options
author | Dmitry Stogov <dmitry@php.net> | 2006-10-12 06:46:51 +0000 |
---|---|---|
committer | Dmitry Stogov <dmitry@php.net> | 2006-10-12 06:46:51 +0000 |
commit | e6fd66facbe1766e8ad53e7826471796ea7eb6dd (patch) | |
tree | dde6b3f361f20f9490404bafa8bd1c2876992677 /Zend/zend_alloc.c | |
parent | 8b8eb2cf88a2ce9bb27f589b290175201b30546d (diff) | |
download | php-git-e6fd66facbe1766e8ad53e7826471796ea7eb6dd.tar.gz |
Make zend_memory_peak_usage() to be avalable even without --enable-memory-limit
Diffstat (limited to 'Zend/zend_alloc.c')
-rw-r--r-- | Zend/zend_alloc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index a51e963b4a..5303c9b1fb 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -1808,16 +1808,18 @@ ZEND_API size_t zend_memory_usage(int real_usage TSRMLS_DC) } } -#if MEMORY_LIMIT ZEND_API size_t zend_memory_peak_usage(int real_usage TSRMLS_DC) { +#if MEMORY_LIMIT if (real_usage) { return AG(mm_heap)->real_peak; } else { return AG(mm_heap)->peak; } -} +#else + return 0; #endif +} ZEND_API void shutdown_memory_manager(int silent, int full_shutdown TSRMLS_DC) { |