Merge branch 'master' of git://factorcode.org/git/factor

2009-05-05 16:47:03 -05:00 · 2009-05-05 16:47:03 -05:00 · 9cd518c330
parent 875d98197b be207afe9a
commit 9cd518c330
2 changed files with 6 additions and 2 deletions
--- a/vm/write_barrier.cpp
+++ b/vm/write_barrier.cpp
@ -4,4 +4,8 @@ using namespace factor;

 cell cards_offset;
 cell decks_offset;
-cell allot_markers_offset;
+
+namespace factor
+{
+        cell allot_markers_offset;
+}
--- a/vm/write_barrier.hpp
+++ b/vm/write_barrier.hpp
@ -60,7 +60,7 @@ inline static card *deck_to_card(card_deck *d)

 #define INVALID_ALLOT_MARKER 0xff

-cell allot_markers_offset;
+extern cell allot_markers_offset;

 inline static card *addr_to_allot_marker(object *a)
 {