steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Resolve conflict

slava 2006-12-04 05:28:03 +00:00
parent bdf2cc8abe
commit dc426c13f8
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
vm/code_gc.c
View File

@ -44,8 +44,15 @@ void build_free_list(F_HEAP *heap, CELL size)
{ {
switch(scan->status) switch(scan->status)
{ {
case B_FREE:
update_free_list(heap,prev,scan); 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; prev = scan;