X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=builtin.c;h=dd1fa71d6946a918bd58f2bb676a46c8aacc22da;hb=1b54315968e9549c5a22103b9f10538125dcf2ec;hp=a1a489bf7df7afe2aeacf63d60d3d0e03c745281;hpb=58643d7b82588c540ff0f455c2a34b1cf1eb2fd4;p=cacao.git diff --git a/builtin.c b/builtin.c index a1a489bf7..dd1fa71d6 100644 --- a/builtin.c +++ b/builtin.c @@ -28,7 +28,7 @@ #include "threads/thread.h" #include "threads/locks.h" /* schani */ -#include "sysdep/native-math.h" +#include "native-math.h" builtin_descriptor builtin_desc[] = { {(functionptr) builtin_instanceof, "instanceof"}, @@ -344,7 +344,6 @@ java_objectheader *builtin_new (classinfo *c) #ifdef SIZE_FROM_CLASSINFO c->alignedsize = align_size(c->instancesize); - o = heap_allocate ( c->alignedsize, true, c->finalizer ); #else o = heap_allocate ( c->instancesize, true, c->finalizer ); @@ -381,7 +380,6 @@ void* __builtin_newarray(s4 base_size, java_arrayheader *a; #ifdef SIZE_FROM_CLASSINFO s4 alignedsize = align_size(base_size + (size-1) * elementsize); - a = heap_allocate ( alignedsize, true, NULL ); #else a = heap_allocate ( sizeof(java_objectarray) + (size-1) * elementsize, @@ -390,7 +388,7 @@ void* __builtin_newarray(s4 base_size, #endif if (!a) return NULL; -#if SIZE_FROM_CLASSINFO +#ifdef SIZE_FROM_CLASSINFO memset(a, 0, alignedsize); #else memset(a, 0, base_size + (size-1) * elementsize);