From db5750e3eaf39a47dbccccfe7cdd180fb686aac6 Mon Sep 17 00:00:00 2001 From: Stefan Ring Date: Sat, 16 Oct 2010 23:10:35 +0200 Subject: [PATCH] * autogen.sh: Make it work with unpatched Boehm GC. * src/mm/gc-boehm.cpp: Likewise. --- autogen.sh | 2 +- src/mm/gc-boehm.cpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/autogen.sh b/autogen.sh index 5b41f04c3..93efd66b1 100755 --- a/autogen.sh +++ b/autogen.sh @@ -147,4 +147,4 @@ fi export ACLOCAL AUTOCONF AUTOHEADER AUTOMAKE LIBTOOLIZE -${AUTORECONF} --force --install +${AUTORECONF} --force --install --no-recursive diff --git a/src/mm/gc-boehm.cpp b/src/mm/gc-boehm.cpp index 3cc8ada09..70d494cbb 100644 --- a/src/mm/gc-boehm.cpp +++ b/src/mm/gc-boehm.cpp @@ -41,6 +41,7 @@ #endif #include "boehm-gc/include/gc.h" +#include "boehm-gc/include/javaxfc.h" #include "mm/gc.hpp" #include "mm/memory.hpp" @@ -60,6 +61,7 @@ /* global variables ***********************************************************/ static bool in_gc_out_of_memory = false; /* is GC out of memory? */ +static size_t gc_max_heap_size = 0; /* prototype static functions *************************************************/ @@ -105,6 +107,7 @@ void gc_init(size_t heapmaxsize, size_t heapstartsize) /* set the maximal heap size */ GC_set_max_heap_size(heapmaxsize); + gc_max_heap_size = heapmaxsize; /* set the initial heap size */ @@ -215,7 +218,7 @@ int64_t gc_get_total_bytes(void) int64_t gc_get_max_heap_size(void) { - return GC_get_max_heap_size(); + return gc_max_heap_size; } -- 2.25.1