aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGerd Moellmann2000-10-20 19:14:07 +0000
committerGerd Moellmann2000-10-20 19:14:07 +0000
commit13c844fb71c9bc7031fdac50561938b62bb75bfd (patch)
tree09ea75e85c46dd9eaf8b383b0aa7a0222cc7c6a1 /src
parent8b30ba1a4db7efc7d591eb41b077ba5f31f63048 (diff)
downloademacs-13c844fb71c9bc7031fdac50561938b62bb75bfd.tar.gz
emacs-13c844fb71c9bc7031fdac50561938b62bb75bfd.zip
(toplevel): Conditionalize compilation of mem_*
functions differently.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/alloc.c7
2 files changed, 11 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index fb359528697..e6ae01e40ab 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12000-10-20 Gerd Moellmann <gerd@gnu.org>
2
3 * alloc.c (toplevel): Conditionalize compilation of mem_*
4 functions differently.
5
12000-10-20 Jason Rumney <jasonr@gnu.org> 62000-10-20 Jason Rumney <jasonr@gnu.org>
2 7
3 * alloc.c (toplevel): Move #ifdef GC_MARK_STACK back to above 8 * 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)
2530 C Stack Marking 2530 C Stack Marking
2531 ************************************************************************/ 2531 ************************************************************************/
2532 2532
2533#if GC_MARK_STACK 2533#if GC_MARK_STACK || defined GC_MALLOC_CHECK
2534
2534/* Initialize this part of alloc.c. */ 2535/* Initialize this part of alloc.c. */
2535 2536
2536static void 2537static void
@@ -3074,6 +3075,10 @@ live_buffer_p (m, p)
3074 && !NILP (((struct buffer *) p)->name)); 3075 && !NILP (((struct buffer *) p)->name));
3075} 3076}
3076 3077
3078#endif /* GC_MARK_STACK || defined GC_MALLOC_CHECK */
3079
3080#if GC_MARK_STACK
3081
3077#if GC_MARK_STACK == GC_USE_GCPROS_CHECK_ZOMBIES 3082#if GC_MARK_STACK == GC_USE_GCPROS_CHECK_ZOMBIES
3078 3083
3079/* Array of objects that are kept alive because the C stack contains 3084/* Array of objects that are kept alive because the C stack contains