From: Dmitry Stogov <dmitry@php.net>
Date: Thu, 12 Oct 2006 06:47:04 +0000 (+0000)
Subject: Make zend_memory_peak_usage() to be avalable even without --enable-memory-limit
X-Git-Tag: RELEASE_1_0_0RC1~1299
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b907cd59d5ec01f980c6ec8fec49173141a94980;p=php

Make zend_memory_peak_usage() to be avalable even without --enable-memory-limit
---

diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index c5bf1804c8..8974cabf09 100644
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@ -1850,16 +1850,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)
diff --git a/Zend/zend_alloc.h b/Zend/zend_alloc.h
index c251bd0ec4..00672f9b0b 100644
--- a/Zend/zend_alloc.h
+++ b/Zend/zend_alloc.h
@@ -119,10 +119,8 @@ void zend_debug_alloc_output(char *format, ...);
 #define full_mem_check(silent)
 #endif
 
-#if MEMORY_LIMIT
 ZEND_API size_t zend_memory_usage(int real_usage TSRMLS_DC);
 ZEND_API size_t zend_memory_peak_usage(int real_usage TSRMLS_DC);
-#endif
 
 END_EXTERN_C()