deativated lifespan analyser in production version

diff --git a/mm/Makefile b/mm/Makefile
index 8c669041f6440bab6a8bab9cfb5f7ae93aa2f67f..69f8f49b0b07d205db04017cfef006c5f2583f3f 100644 (file)
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -1,5 +1,5 @@
 # cacao/mm/Makefile
-# $Id: Makefile 93 1998-11-25 11:49:36Z phil $
+# $Id: Makefile 96 1998-11-30 14:53:53Z phil $
 
 AR = ar
 COMBINE = $(AR) rcs mm.o
@@ -29,15 +29,16 @@ heap.old.o: heap.old.c ../tables.h ../global.h
 # Targets below this point are experimental and may not work reliably
 
 
-gc2: heap2.o allocator2.o bitmap2.o
-       rm -f mm.o; $(COMBINE) heap2.o allocator2.o bitmap2.o
+gc2: heap2.o allocator2.o bitmap2.o lifespan.o
+       rm -f mm.o; $(COMBINE) heap2.o allocator2.o bitmap2.o lifespan.o
 
-heap2.o: heap2.c allocator.h mm.h bitmap2.h
+heap2.o: heap2.c allocator.h mm.h bitmap2.h lifespan.h
 
 bitmap2.o: bitmap2.c bitmap2.h allocator.h mm.h
 
 allocator2.o: allocator.h allocator2.c 
 
+lifespan.o: lifespan.h lifespan.c
 
 #
 # These are local overrides for various environment variables in Emacs.

diff --git a/mm/heap2.c b/mm/heap2.c
index 4e20e60f989a7032375c740a5669714cb866bb56..13c28c76a8cc374d0e122b76eef39c4fc45dba05 100644 (file)
--- a/mm/heap2.c
+++ b/mm/heap2.c
@@ -21,7 +21,7 @@
 #undef OFFSET
 
 //#define COLLECT_LIFESPAN
-#define NEW_COLLECT_LIFESPAN
+//#define NEW_COLLECT_LIFESPAN
 #define GC_COLLECT_STATISTICS
 #define FINALIZER_COUNTING