From: bdemsky <bdemsky>
Date: Tue, 7 Apr 2009 06:43:05 +0000 (+0000)
Subject: fix compile
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=56b370883d5ff0ca5e7e6a7550a0633f9c02ab8e;p=IRC.git

fix compile
---

diff --git a/Robust/src/Runtime/garbage.c b/Robust/src/Runtime/garbage.c
index 539119e2..61e56d92 100644
--- a/Robust/src/Runtime/garbage.c
+++ b/Robust/src/Runtime/garbage.c
@@ -197,8 +197,10 @@ void collect(struct garbagelist * stackptr) {
 #if defined(THREADS)||defined(DSTM)||defined(STM)
   /* Go to next thread */
   if (listptr!=NULL) {
+#ifdef THREADS
     void * orig=listptr->locklist;
     ENQUEUE(orig, listptr->locklist);
+#endif
     stackptr=listptr->stackptr;
     listptr=listptr->next;
   } else
@@ -474,7 +476,9 @@ struct listitem * stopforgc(struct garbagelist * ptr) {
 
 void restartaftergc(struct listitem * litem) {
   pthread_mutex_lock(&gclistlock);
+#ifdef THREADS
   pthread_setspecific(threadlocks, litem->locklist);
+#endif
   if (litem->prev==NULL) {
     list=litem->next;
   } else {
diff --git a/Robust/src/Runtime/garbage.h b/Robust/src/Runtime/garbage.h
index 41ec5ea1..cfe60730 100644
--- a/Robust/src/Runtime/garbage.h
+++ b/Robust/src/Runtime/garbage.h
@@ -1,5 +1,8 @@
 #ifndef GARBAGE_H
 #define GARBAGE_H
+#ifdef STM
+#include "clookup.h"
+#endif
 struct garbagelist {
   int size;
   struct garbagelist *next;