gcc 3.x fix

diff --git a/library/test/memory.factor b/library/test/memory.factor
index 8fea613b2a2bd3d1fdb1e4f5c50a02c2a2beb0a4..dcabd540947e0cbd08f5cd2b64c2319741b26e3a 100644 (file)
--- a/library/test/memory.factor
+++ b/library/test/memory.factor
@@ -7,7 +7,7 @@ USE: lists
 
 num-types [
     [
-        instances [
+        (instances) [
             class drop
         ] each
     ] keep

diff --git a/native/walk.c b/native/walk.c
index 51257d93c673bcab5e8e19d6578ada21fe8e6675..007ceb3085796aaf3a7dedeee7df3012ca902a3f 100644 (file)
--- a/native/walk.c
+++ b/native/walk.c
@@ -42,6 +42,8 @@ void primitive_instances(void)
        CELL search_type = to_fixnum(dpop());
        CELL here = active.here;
 
+       primitive_gc();
+
        begin_heap_walk();
        
        for(;;)

diff --git a/native/walk.h b/native/walk.h
index 5a76a5f70ce22f8c26cb4073fe60f3d8849cb58a..ae702597f49920a3c32071ea2f80e709946be560 100644 (file)
--- a/native/walk.h
+++ b/native/walk.h
@@ -8,7 +8,7 @@ INLINE void begin_heap_walk(void)
        heap_walk_ptr = active.base;
 }
 
-INLINE bool heap_step(CELL* size, CELL* type)
+INLINE CELL heap_step(CELL* size, CELL* type)
 {
        CELL value = get(heap_walk_ptr);
        CELL obj = heap_walk_ptr;