summaryrefslogtreecommitdiff
path: root/malloc.c
diff options
context:
space:
mode:
authorivmai <ivmai>2009-09-16 11:03:54 +0200
committerIvan Maidanski <ivmai@mail.ru>2011-07-26 19:06:46 +0200
commit41cf316c7387d9f09a0be4680de44008f4e5d488 (patch)
tree8376ec0b891723e9691dda3ab77b1f0d3b5acdcf /malloc.c
parent898431fe87e36e0749d81422ba7ad473ba660b67 (diff)
2009-09-16 Ivan Maidanski <ivmai@mail.ru>
(ivmai134.diff) * alloc.c (GC_expand_hp): Replace GC_init_inner() call with GC_init() one. * malloc.c (GC_alloc_large, GC_generic_malloc_inner): Ditto. * mallocx.c (GC_generic_malloc_many): Ditto. * misc.c (GC_enable_incremental): Ditto. * alloc.c (GC_expand_hp): Update the comment. * mark.c (GC_obj_kinds): Ditto. * win32_threads.c (GC_allow_register_threads): Ditto. * private/gc_priv.h (GC_init_inner): Remove function declaration. * misc.c (GC_init_inner): Replace with public GC_init().
Diffstat (limited to 'malloc.c')
-rw-r--r--malloc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/malloc.c b/malloc.c
index 07c4b59..dff23e1 100644
--- a/malloc.c
+++ b/malloc.c
@@ -50,7 +50,7 @@ ptr_t GC_alloc_large(size_t lb, int k, unsigned flags)
/* Round up to a multiple of a granule. */
lb = (lb + GRANULE_BYTES - 1) & ~(GRANULE_BYTES - 1);
n_blocks = OBJ_SZ_TO_BLOCKS(lb);
- if (!GC_is_initialized) GC_init_inner();
+ if (!GC_is_initialized) GC_init();
/* Do our share of marking work */
if(GC_incremental && !GC_dont_gc)
GC_collect_a_little_inner((int)n_blocks);
@@ -112,7 +112,7 @@ void * GC_generic_malloc_inner(size_t lb, int k)
if( (op = *opp) == 0 ) {
if (GC_size_map[lb] == 0) {
- if (!GC_is_initialized) GC_init_inner();
+ if (!GC_is_initialized) GC_init();
if (GC_size_map[lb] == 0) GC_extend_size_map(lb);
return(GC_generic_malloc_inner(lb, k));
}