From 66daf1e88e64b92fa7b1d0db95c4b50dcac2dd81 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Sun, 31 May 2009 01:58:51 +0000 Subject: [PATCH] fix mzconfig dependency; use GC_ASSERT svn: r15028 --- src/mzscheme/gc2/Makefile.in | 3 +-- src/mzscheme/gc2/newgc.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/mzscheme/gc2/Makefile.in b/src/mzscheme/gc2/Makefile.in index 63087d7dfa..1cf5ac8f65 100644 --- a/src/mzscheme/gc2/Makefile.in +++ b/src/mzscheme/gc2/Makefile.in @@ -327,13 +327,12 @@ gc2.@LTO@: \ $(srcdir)/immobile_boxes.c \ $(srcdir)/../include/scheme.h \ $(srcdir)/../include/../sconfig.h \ - $(srcdir)/../include/../mzconfig.h \ $(srcdir)/../include/../uconfig.h \ $(srcdir)/../include/../src/stypes.h \ $(srcdir)/../include/../src/schexn.h \ $(srcdir)/../include/../gc2/gc2.h \ $(srcdir)/../include/../src/schemef.h \ - $(srcdir)/../mzconfig.h \ + $(builddir)/../mzconfig.h \ $(srcdir)/../src/mzrt.h \ $(srcdir)/../src/schpriv.h \ $(srcdir)/../utils/splay.c \ diff --git a/src/mzscheme/gc2/newgc.c b/src/mzscheme/gc2/newgc.c index 2652da2b6d..46a4800755 100644 --- a/src/mzscheme/gc2/newgc.c +++ b/src/mzscheme/gc2/newgc.c @@ -428,8 +428,8 @@ int GC_is_allocated(void *p) #define MAX_OBJECT_SIZEW (gcBYTES_TO_WORDS(APAGE_SIZE) - PREFIX_WSIZE - 3) #define MAX_OBJECT_SIZE (gcWORDS_TO_BYTES(MAX_OBJECT_SIZEW)) -#define ASSERT_TAG(tag) assert((tag) >= 0 && (tag) <= NUMBER_OF_TAGS) -#define ASSERT_VALID_OBJPTR(objptr) assert(!((long)(objptr) & (0x3))) +#define ASSERT_TAG(tag) GC_ASSERT((tag) >= 0 && (tag) <= NUMBER_OF_TAGS) +#define ASSERT_VALID_OBJPTR(objptr) GC_ASSERT(!((long)(objptr) & (0x3))) /* Generation 0. Generation 0 is a set of very large pages in a list(gc->gen0.pages), plus a set of smaller bigpages in a separate list(gc->gen0.big_pages).