Merged.

[cacao.git] / src / mm / gc-boehm.cpp

diff --git a/src/mm/gc-boehm.cpp b/src/mm/gc-boehm.cpp
index 9fa1969b993018abce6255f82ac2b249d5757173..c8dc49ba2ea09abfb77200cbd93ce35cd60ea07b 100644 (file)
--- a/src/mm/gc-boehm.cpp
+++ b/src/mm/gc-boehm.cpp
@@ -43,17 +43,16 @@
 
 #include "toolbox/logging.h"
 
-#include "vm/builtin.h"
-#include "vm/exceptions.h"
-#include "vm/finalizer.h"
+#include "vm/jit/builtin.hpp"
+#include "vm/exceptions.hpp"
+#include "vm/finalizer.hpp"
 #include "vm/global.h"
-#include "vm/stringlocal.h"
+#include "vm/loader.hpp"
+#include "vm/options.h"
+#include "vm/rt-timing.h"
+#include "vm/string.hpp"
 #include "vm/vm.hpp"
 
-#include "vmcore/loader.h"
-#include "vmcore/options.h"
-#include "vmcore/rt-timing.h"
-
 
 /* global variables ***********************************************************/
 
@@ -241,7 +240,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;
@@ -266,7 +265,7 @@ 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