fixes for oooJava gc

diff --git a/Robust/src/Runtime/garbage.c b/Robust/src/Runtime/garbage.c
index b8d0a0aea7abb71eab1580ece8c3e5566170c544..7312a6fcb790a12cdea345a8d7377abd879f2e01 100644 (file)
--- a/Robust/src/Runtime/garbage.c
+++ b/Robust/src/Runtime/garbage.c
@@ -10,14 +10,7 @@
 #include "thread.h"
 #endif
 #ifdef MLP
-#ifdef SQUEUE
-#include "squeue.h"
-#else
-#include "deque.h"
-#endif
 #include "workschedule.h"
-extern volatile int    numWorkSchedWorkers;
-extern deque* deques;
 #endif
 
 #ifdef DMALLOC

diff --git a/Robust/src/Runtime/oojgarbage.c b/Robust/src/Runtime/oojgarbage.c
index 8a14558f3524485fcff981ce9a91c1d431694164..c4a531f33e5d9b50b78a433fae8904ccf63a42ce 100644 (file)
--- a/Robust/src/Runtime/oojgarbage.c
+++ b/Robust/src/Runtime/oojgarbage.c
@@ -1,6 +1,15 @@
+#ifdef MLP
 #include "garbage.h"
+#ifdef SQUEUE
+#include "squeue.h"
+#else
+#include "deque.h"
+#endif
+#include "mlp_runtime.h"
+#include "workschedule.h"
+extern volatile int    numWorkSchedWorkers;
+extern deque* deques;
 
-#ifdef MLP
 __thread SESEcommon* seseCommon;
 
 void searchoojroots() {