diff --git a/src/ChangeLog b/src/ChangeLog
index fb359528697..e6ae01e40ab 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-20  Gerd Moellmann  <gerd@gnu.org>
+
+	* alloc.c (toplevel): Conditionalize compilation of mem_*
+	functions differently.
+	
 2000-10-20  Jason Rumney  <jasonr@gnu.org>
 
 	* alloc.c (toplevel): Move #ifdef GC_MARK_STACK back to above
diff --git a/src/alloc.c b/src/alloc.c
index 56b0d6fd16d..54c4b447fde 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -2530,7 +2530,8 @@ make_event_array (nargs, args)
 			   C Stack Marking
  ************************************************************************/
 
-#if GC_MARK_STACK
+#if GC_MARK_STACK || defined GC_MALLOC_CHECK
+
 /* Initialize this part of alloc.c.  */
 
 static void
@@ -3074,6 +3075,10 @@ live_buffer_p (m, p)
 	  && !NILP (((struct buffer *) p)->name));
 }
 
+#endif /* GC_MARK_STACK || defined GC_MALLOC_CHECK */
+
+#if GC_MARK_STACK
+
 #if GC_MARK_STACK == GC_USE_GCPROS_CHECK_ZOMBIES
 
 /* Array of objects that are kept alive because the C stack contains