From: bdemsky <bdemsky>
Date: Mon, 6 Apr 2009 19:59:01 +0000 (+0000)
Subject: oops
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=16e68224303f2d6e5e88b7daa4fa56dca1dad4b0;p=IRC.git

oops
---

diff --git a/Robust/src/Runtime/garbage.c b/Robust/src/Runtime/garbage.c
index 7b5c9886..081eec74 100644
--- a/Robust/src/Runtime/garbage.c
+++ b/Robust/src/Runtime/garbage.c
@@ -39,7 +39,7 @@ extern struct ctable *reverse;
 extern struct RuntimeHash *fdtoobject;
 #endif
 
-#if defined(THREADS) || defined(DSTM) || defined(SINGLETM)
+#if defined(THREADS) || defined(DSTM) || defined(STM)
 int needtocollect=0;
 struct listitem * list=NULL;
 int listcount=0;
diff --git a/Robust/src/Runtime/garbage.h b/Robust/src/Runtime/garbage.h
index 557365a2..b9c533f5 100644
--- a/Robust/src/Runtime/garbage.h
+++ b/Robust/src/Runtime/garbage.h
@@ -17,7 +17,7 @@ struct listitem {
 void fixtags();
 #endif
 
-#if defined(THREADS)||defined(DSTM)||defined(SINGLETM)
+#if defined(THREADS)||defined(DSTM)||defined(STM)
 extern int needtocollect;
 void checkcollect(void * ptr);
 struct listitem * stopforgc(struct garbagelist * ptr);
diff --git a/Robust/src/Runtime/thread.c b/Robust/src/Runtime/thread.c
index 20c33423..c07d5d21 100644
--- a/Robust/src/Runtime/thread.c
+++ b/Robust/src/Runtime/thread.c
@@ -107,7 +107,7 @@ void initializethreads() {
   signal(SIGPIPE, SIG_IGN);
 }
 
-#if defined(THREADS)||defined(SINGLETM)
+#if defined(THREADS)||defined(STM)
 void initthread(struct ___Thread___ * ___this___) {
 #ifdef PRECISE_GC
   int p[]={1, (int) NULL, (int) ___this___};
@@ -129,20 +129,20 @@ void initthread(struct ___Thread___ * ___this___) {
 #endif
 
 void CALL11(___Thread______sleep____J, long long ___millis___, long long ___millis___) {
-#if defined(THREADS)||defined(SINGLETM)
+#if defined(THREADS)||defined(STM)
 #ifdef PRECISE_GC
   struct listitem *tmp=stopforgc((struct garbagelist *)___params___);
 #endif
 #endif
   usleep(___millis___);
-#if defined(THREADS)||defined(SINGLETM)
+#if defined(THREADS)||defined(STM)
 #ifdef PRECISE_GC
   restartaftergc(tmp);
 #endif
 #endif
 }
 
-#if defined(DSTM)|| defined(THREADS)||defined(SINGLETM)
+#if defined(DSTM)|| defined(THREADS)||defined(STM)
 void CALL00(___Thread______yield____) {
   pthread_yield();
 }
@@ -201,7 +201,7 @@ transstart:
 }
 #endif
 
-#if defined(THREADS)||defined(SINGLETM)
+#if defined(THREADS)||defined(STM)
 void CALL01(___Thread______nativeJoin____, struct ___Thread___ * ___this___) {
 #ifdef PRECISE_GC
     struct listitem *tmp=stopforgc((struct garbagelist *)___params___);