summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2011-05-14 17:23:23 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2011-05-14 17:23:23 +0000
commitad30100e09d949ee1bf786e5e7448c0024a70e77 (patch)
treea881cddc5fa81529d9b5f600ff9e597dd1dbd694
parentfdb4a832136b9ef29c5c797555b542854aec9d04 (diff)
downloadzsh-ad30100e09d949ee1bf786e5e7448c0024a70e77.tar.gz
zsh-ad30100e09d949ee1bf786e5e7448c0024a70e77.zip
29282: hide prototypes for ZSH_HEAP_DEBUG with #ifdef's
-rw-r--r--ChangeLog7
-rw-r--r--Src/mem.c5
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f88377c55..ded88181d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-14 Peter Stephenson <p.w.stephenson@ntlworld.com>
+
+ * 29282: Src/mem.c: hide prototypes for ZSH_HEAP_DEBUG with
+ #ifdef's.
+
2011-05-14 Bart Schaefer <schaefer@zsh.org>
* 29276: Src/zsh.h: typedef Heapid unconditionally, to prevent
@@ -14703,5 +14708,5 @@
*****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5302 $
+* $Revision: 1.5303 $
*****************************************************
diff --git a/Src/mem.c b/Src/mem.c
index 83a4bbad7..5275c6c98 100644
--- a/Src/mem.c
+++ b/Src/mem.c
@@ -123,6 +123,7 @@ static Heap heaps;
static Heap fheap;
+/**/
#ifdef ZSH_HEAP_DEBUG
/*
* The heap ID we'll allocate next.
@@ -172,6 +173,8 @@ new_heap_id(void)
{
return next_heap_id++;
}
+
+/**/
#endif
/* Use new heaps from now on. This returns the old heap-list. */
@@ -723,6 +726,7 @@ hrealloc(char *p, size_t old, size_t new)
}
}
+/**/
#ifdef ZSH_HEAP_DEBUG
/*
* Check if heap_id is the identifier of a currently valid heap,
@@ -768,6 +772,7 @@ memory_validate(Heapid heap_id)
return 1;
}
+/**/
#endif
/* allocate memory from the current memory pool and clear it */