Mercurial > hg > xemacs-beta

diff nt/xemacs.mak @ 3263:d674024a8674

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2006-02-27 16:29:00 by crestani] - Introduce a fancy asynchronous finalization strategy on C level. - Merge the code conditioned on MC_ALLOC into the code conditioned on NEW_GC. - Remove the possibility to free objects manually outside garbage collections when the new collector is enabled.
author crestani
date Mon, 27 Feb 2006 16:29:29 +0000
parents 141c2920ea48
children 57711e9aac15
line wrap: on
line diff
--- a/nt/xemacs.mak	Sun Feb 26 22:51:04 2006 +0000
+++ b/nt/xemacs.mak	Mon Feb 27 16:29:29 2006 +0000
@@ -215,9 +215,6 @@
 !if !defined(USE_KKCC)
 USE_KKCC=0
 !endif
-!if !defined(MC_ALLOC)
-MC_ALLOC=0
-!endif
 !if !defined(NEW_GC)
 NEW_GC=0
 !endif
@@ -644,20 +641,15 @@
 
 !if $(NEW_GC)
 OPT_DEFINES=$(OPT_DEFINES) -DNEW_GC
-OPT_OBJS=$(OPT_OBJS) $(OUTDIR)\vdb.obj $(OUTDIR)\vdb-win32.obj
+OPT_OBJS=$(OPT_OBJS) $(OUTDIR)\vdb.obj $(OUTDIR)\vdb-win32.obj \
+	$(OUTDIR)\mc-alloc.obj
 USE_KKCC=1
-MC_ALLOC=1
 !endif
 
 !if $(USE_KKCC)
 OPT_DEFINES=$(OPT_DEFINES) -DUSE_KKCC
 !endif
 
-!if $(MC_ALLOC)
-OPT_DEFINES=$(OPT_DEFINES) -DMC_ALLOC
-OPT_OBJS=$(OPT_OBJS) $(OUTDIR)\mc-alloc.obj
-!endif
-
 !if $(USE_SYSTEM_MALLOC)
 OPT_DEFINES=$(OPT_DEFINES) -DSYSTEM_MALLOC
 !else
@@ -1266,13 +1258,10 @@
   Disabling non-essential build actions.  Use with care!
 !endif
 !if $(USE_KKCC)
-  Using new experimental GC algorithms.
-!endif
-!if $(MC_ALLOC)
-  Using new experimental allocator.
+  Using new experimental GC mark algorithms.
 !endif
 !if $(NEW_GC)
-  Using new experimental incremental garbage collector.
+  Using new experimental incremental garbage collector and new allocator.
 !endif
 <<NOKEEP
 	@echo --------------------------------------------------------------------