* src/vm/jit/inline/inline.c (emit_inlining_prolog): Set javaindex

[cacao.git] / src / cacaoh / headers.c

diff --git a/src/cacaoh/headers.c b/src/cacaoh/headers.c
index 49f8e0c5b379621d00439e4062686f917ebc871f..a4a21570908ab2246fa6196b9976f638d841efbe 100644 (file)
--- a/src/cacaoh/headers.c
+++ b/src/cacaoh/headers.c
@@ -25,13 +25,12 @@
    Contact: cacao@cacaojvm.org
 
    Authors: Reinhard Grafl
-
-   Changes: Mark Probst
+            Mark Probst
             Philipp Tomsich
             Christian Thalinger
-                       Edwin Steiner
+            Edwin Steiner
 
-   $Id: headers.c 5854 2006-10-29 11:15:36Z edwin $
+   $Id: headers.c 5935 2006-11-08 20:27:37Z twisti $
 
 */
 
@@ -53,7 +52,7 @@
 # include <ucontext.h>
 #endif
 
-#include "mm/boehm.h"
+#include "mm/gc-common.h"
 #include "mm/memory.h"
 #include "native/include/java_lang_String.h"
 #include "native/include/java_lang_Throwable.h"
@@ -494,7 +493,7 @@ void exceptions_throw_negativearraysizeexception(void)
 }
 
 
-java_objectheader *new_nullpointerexception(void)
+java_objectheader *exceptions_new_nullpointerexception(void)
 {
        fprintf(stderr, "%s", string_java_lang_NullPointerException);
        exit(1);
@@ -507,7 +506,7 @@ java_objectheader *new_nullpointerexception(void)
 
 void exceptions_throw_nullpointerexception(void)
 {
-       (void) new_nullpointerexception();
+       (void) exceptions_new_nullpointerexception();
 }
 
 
@@ -567,7 +566,7 @@ static void addoutputsize (int len)
        u4 newsize,i;
        if (!dopadding) return;
 
-       newsize = ALIGN(outputsize, len);
+       newsize = MEMORY_ALIGN(outputsize, len);
        
        for (i = outputsize; i < newsize; i++) fprintf(file, "   u1 pad%d\n", (int) i);
        outputsize = newsize;