From: schani <none@none>
Date: Thu, 5 Nov 1998 13:06:05 +0000 (+0000)
Subject: Cacao does now compile again with threads disabled.
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=33fa1c49d7765bd4cdbe7612c117722d15f0812a;p=cacao.git

Cacao does now compile again with threads disabled.
---

diff --git a/main.c b/main.c
index 51197cb0f..40673045c 100644
--- a/main.c
+++ b/main.c
@@ -442,7 +442,9 @@ int main(int argc, char **argv)
 #endif
 
 
+#ifdef USE_THREADS
 	atexit(clear_thread_flags);
+#endif
 
    /************ Infos aus der Environment lesen ************************/
 
diff --git a/mm/heap.old.c b/mm/heap.old.c
index 478e40b22..debd9e585 100644
--- a/mm/heap.old.c
+++ b/mm/heap.old.c
@@ -693,7 +693,6 @@ gc_call (void)
 {
 #ifdef USE_THREADS
 	assert(blockInts == 0);
-#endif
 
 	intsDisable();
 	if (currentThread == NULL || currentThread == mainThread)
@@ -701,6 +700,9 @@ gc_call (void)
 	else
 		asm_switchstackandcall(CONTEXT(mainThread).usedStackTop, heap_docollect);
 	intsRestore();
+#else
+	heap_docollect();
+#endif
 }
 
 
diff --git a/src/cacao/cacao.c b/src/cacao/cacao.c
index 51197cb0f..40673045c 100644
--- a/src/cacao/cacao.c
+++ b/src/cacao/cacao.c
@@ -442,7 +442,9 @@ int main(int argc, char **argv)
 #endif
 
 
+#ifdef USE_THREADS
 	atexit(clear_thread_flags);
+#endif
 
    /************ Infos aus der Environment lesen ************************/