* src/cacaoh/dummy.c (heap_alloc_uncollectable): Use stdint-types.

* src/mm/boehm.c: Likewise.
* src/mm/gc-common.h: Likewise.

diff --git a/src/cacaoh/dummy.c b/src/cacaoh/dummy.c
index e33f64f3d790120dd0e089b7011199c11920b5f7..945f209568a2da024d3923988d595c8ccea572b7 100644 (file)
--- a/src/cacaoh/dummy.c
+++ b/src/cacaoh/dummy.c
@@ -32,6 +32,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "mm/gc-common.h"
 #include "mm/memory.h"
 
 #include "native/llni.h"
@@ -461,7 +462,7 @@ int64_t gc_get_max_heap_size(void)
 
 /* heap ***********************************************************************/
 
-void *heap_alloc_uncollectable(uint32_t bytelength)
+void *heap_alloc_uncollectable(size_t bytelength)
 {
        return calloc(bytelength, 1);
 }

diff --git a/src/mm/boehm.c b/src/mm/boehm.c
index 7d0ef6fd53a93563e2cb1d46320683e885cc3df3..ab0fc912e53e6779ad8414d17a80ac136e6d9761 100644 (file)
--- a/src/mm/boehm.c
+++ b/src/mm/boehm.c
@@ -117,7 +117,7 @@ static void gc_ignore_warnings(char *msg, GC_word arg)
 }
 
 
-void *heap_alloc_uncollectable(u4 size)
+void *heap_alloc_uncollectable(size_t size)
 {
        void *p;
 

diff --git a/src/mm/gc-common.h b/src/mm/gc-common.h
index f3b6ff9259c19f10a28a78952173e691d8b97987..7bdf5cb57bfd70d6faebdce7adda481f3e1f3b42 100644 (file)
--- a/src/mm/gc-common.h
+++ b/src/mm/gc-common.h
@@ -1,9 +1,7 @@
 /* src/mm/gc-common.h - gc independant interface for heap managment
 
-   Copyright (C) 1996-2005, 2006, 2007 R. Grafl, A. Krall, C. Kruegel,
-   C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
-   E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
-   J. Wenninger, Institut f. Computersprachen - TU Wien
+   Copyright (C) 1996-2005, 2006, 2007, 2008
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
@@ -56,7 +54,7 @@ enum {
 
 void  gc_init(u4 heapmaxsize, u4 heapstartsize);
 
-void *heap_alloc_uncollectable(u4 size);
+void *heap_alloc_uncollectable(size_t size);
 void *heap_alloc(u4 size, u4 references, methodinfo *finalizer, bool collect);
 void  heap_free(void *p);