From c6d855d494984df5879635feb7b6db68efb72b53 Mon Sep 17 00:00:00 2001
From: Phil Dawes <phil@phildawes.net>
Date: Thu, 20 Aug 2009 20:35:54 +0100
Subject: [PATCH] moved allot_markers_offset variable into vm struct

---
 vm/vm.hpp            | 2 ++
 vm/write_barrier.cpp | 4 ----
 vm/write_barrier.hpp | 1 -
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/vm/vm.hpp b/vm/vm.hpp
index 12f767404f..7508abf5ea 100644
--- a/vm/vm.hpp
+++ b/vm/vm.hpp
@@ -7,6 +7,7 @@ struct factorvm {
 	/* new objects are allocated here */
 	zone nursery;
 
+
 	// segments
 	inline cell align_page(cell a);
 
@@ -169,6 +170,7 @@ struct factorvm {
 
 	
 	//write barrier
+	cell allot_markers_offset;
 	inline card *addr_to_card(cell a);
 	inline cell card_to_addr(card *c);
 	inline cell card_offset(card *c);
diff --git a/vm/write_barrier.cpp b/vm/write_barrier.cpp
index 0e87434b56..7ce764722e 100644
--- a/vm/write_barrier.cpp
+++ b/vm/write_barrier.cpp
@@ -5,7 +5,3 @@ using namespace factor;
 cell cards_offset;
 cell decks_offset;
 
-namespace factor
-{
-        cell allot_markers_offset;
-}
diff --git a/vm/write_barrier.hpp b/vm/write_barrier.hpp
index b45573b126..b2b370d274 100755
--- a/vm/write_barrier.hpp
+++ b/vm/write_barrier.hpp
@@ -29,6 +29,5 @@ static const cell deck_bits = (card_bits + 10);
 static const cell deck_size = (1<<deck_bits);
 static const cell addr_deck_mask = (deck_size-1);
 static const cell invalid_allot_marker = 0xff;
-extern cell allot_markers_offset;
 
 }