summaryrefslogtreecommitdiff
path: root/malloc.c
diff options
context:
space:
mode:
authorhboehm <hboehm>2008-10-25 07:03:02 +0200
committerIvan Maidanski <ivmai@mail.ru>2011-07-26 19:06:43 +0200
commit559c07bf35031e2d073dae3fbf8f11318953863e (patch)
treeaab07f96b51778d128223cefac74bcf9f42a072f /malloc.c
parent72bb12b8a9a9193c6eb792dce3f7347b0be08297 (diff)
2008-10-24 Hans Boehm <Hans.Boehm@hp.com> (Really Ivan Maidanski)
* alloc.c, dbg_mlc.c, dyn_load.c, finalize.c, gcj_mlc.c, include/gc.h, include/gc_config_macros.h, include/gc_cpp.h, include/gc_gcj.h, include/gc_mark.h, include/gc_typed.h, include/javaxfc.h, include/private/gc_locks.h, include/private/gc_priv.h, malloc.c, mallocx.c, mark.c, mark_rts.c, misc.c, obj_map.c, os_dep.c, pthread_support.c, ptr_chck.c, stubborn.c, tests/test.c, thread_local_alloc.c, typd_mlc.c win32_threads.c: Add GC_CALL and GC_CALLBACK macro invocations. * test.c: Remove some old K&R code.
Diffstat (limited to 'malloc.c')
-rw-r--r--malloc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/malloc.c b/malloc.c
index 67e7422..9928ea2 100644
--- a/malloc.c
+++ b/malloc.c
@@ -206,7 +206,7 @@ void * GC_generic_malloc(size_t lb, int k)
#ifdef THREAD_LOCAL_ALLOC
void * GC_core_malloc_atomic(size_t lb)
#else
- GC_API void * GC_malloc_atomic(size_t lb)
+ GC_API void * GC_CALL GC_malloc_atomic(size_t lb)
#endif
{
void *op;
@@ -233,7 +233,7 @@ void * GC_generic_malloc(size_t lb, int k)
/* provide a version of strdup() that uses the collector to allocate the
copy of the string */
-GC_API char *GC_strdup(const char *s)
+GC_API char * GC_CALL GC_strdup(const char *s)
{
char *copy;
@@ -250,7 +250,7 @@ GC_API char *GC_strdup(const char *s)
#ifdef THREAD_LOCAL_ALLOC
void * GC_core_malloc(size_t lb)
#else
- GC_API void * GC_malloc(size_t lb)
+ GC_API void * GC_CALL GC_malloc(size_t lb)
#endif
{
void *op;
@@ -386,7 +386,7 @@ void * calloc(size_t n, size_t lb)
# endif /* REDIRECT_MALLOC */
/* Explicitly deallocate an object p. */
-GC_API void GC_free(void * p)
+GC_API void GC_CALL GC_free(void * p)
{
struct hblk *h;
hdr *hhdr;