X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fmm%2Fgc-boehm.cpp;h=3cc8ada0978e4b94f6c115ca2e0bb859cff9a475;hb=9d9877f7595070f5a7aedba5ae43a4b96a383a25;hp=2b4f64a725ffd397623c37a2efda2927025ace6a;hpb=b784afa1d7e7489fd6a3f97e98f1cd3ba49ec508;p=cacao.git

diff --git a/src/mm/gc-boehm.cpp b/src/mm/gc-boehm.cpp
index 2b4f64a72..3cc8ada09 100644
--- a/src/mm/gc-boehm.cpp
+++ b/src/mm/gc-boehm.cpp
@@ -1,6 +1,6 @@
 /* src/mm/gc-boehm.cpp - interface for boehm gc
 
-   Copyright (C) 1996-2005, 2006, 2007, 2008
+   Copyright (C) 1996-2005, 2006, 2007, 2008, 2010
    CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
@@ -36,18 +36,21 @@
 #if defined(ENABLE_THREADS) && defined(__DARWIN__)
 #define GC_DARWIN_THREADS
 #endif
+#if defined(ENABLE_THREADS) && defined(__SOLARIS__)
+#define GC_SOLARIS_THREADS
+#endif
 
 #include "boehm-gc/include/gc.h"
 #include "mm/gc.hpp"
-#include "mm/memory.h"
+#include "mm/memory.hpp"
 
-#include "toolbox/logging.h"
+#include "toolbox/logging.hpp"
 
-#include "vm/builtin.h"
+#include "vm/jit/builtin.hpp"
 #include "vm/exceptions.hpp"
-#include "vm/finalizer.h"
+#include "vm/finalizer.hpp"
 #include "vm/global.h"
-#include "vm/loader.h"
+#include "vm/loader.hpp"
 #include "vm/options.h"
 #include "vm/rt-timing.h"
 #include "vm/string.hpp"
@@ -240,7 +243,7 @@ void *gc_out_of_memory(size_t bytes_requested)
 
 	if (in_gc_out_of_memory) {
 		/* this is all we can do... */
-		vm_abort("gc_out_of_memory: out of memory");
+		os::abort("gc_out_of_memory: out of memory");
 	}
 
 	in_gc_out_of_memory = true;
@@ -265,9 +268,10 @@ void *gc_out_of_memory(size_t bytes_requested)
  * Emacs will automagically detect them.
  * ---------------------------------------------------------------------
  * Local variables:
- * mode: c
+ * mode: c++
  * indent-tabs-mode: t
  * c-basic-offset: 4
  * tab-width: 4
  * End:
+ * vim:noexpandtab:sw=4:ts=4:
  */