Cacao does now compile again with threads disabled.

diff --git a/main.c b/main.c
index 51197cb0fa2dcd285c8dea804f9f66a73d94e2f8..40673045c156eb87b8ff2ba5d73d2ae71b744245 100644 (file)
--- 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 478e40b2244010bc4f9f85e1024f9b1d032816b6..debd9e585eb564bf0700b16653703c1a770e25eb 100644 (file)
--- 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 51197cb0fa2dcd285c8dea804f9f66a73d94e2f8..40673045c156eb87b8ff2ba5d73d2ae71b744245 100644 (file)
--- 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 ************************/