From dc426c13f840cdeb27454ccb2692d5cf45c408c4 Mon Sep 17 00:00:00 2001
From: slava <slava@factorcode.org>
Date: Mon, 4 Dec 2006 05:28:03 +0000
Subject: [PATCH] Resolve conflict

---
 vm/code_gc.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/vm/code_gc.c b/vm/code_gc.c
index b049647fbb..cfc7b2bfa4 100644
--- a/vm/code_gc.c
+++ b/vm/code_gc.c
@@ -44,8 +44,15 @@ void build_free_list(F_HEAP *heap, CELL size)
 	{
 		switch(scan->status)
 		{
+		case B_FREE:
 			update_free_list(heap,prev,scan);
-			prev = scan;
+			prev_free = scan;
+			break;
+		case B_ALLOCATED:
+			break;
+		default:
+			critical_error("Invalid scan->status",(CELL)scan);
+			break;
 		}
 
 		prev = scan;