summaryrefslogtreecommitdiff
path: root/libguile/foreign.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2011-10-24 18:22:35 +0200
committerAndy Wingo <wingo@pobox.com>2011-10-24 18:59:35 +0200
commit47ed8656db8800f3ad20a40eb2c4e9ef3dc891e3 (patch)
treeef4afe3a80f6441aeda3bf14ae20ab1ee07824c6 /libguile/foreign.c
parent8c5bb72920a41d165726a1b5a610d823971f1ca8 (diff)
downloadguile-47ed8656db8800f3ad20a40eb2c4e9ef3dc891e3.tar.gz
add SCM_HEAP_OBJECT_BASE
* libguile/tags.h (SCM_HEAP_OBJECT_BASE): New macro. Given a SCM, returns a pointer to the start of its memory area on the heap. * libguile/bytevectors.c: * libguile/fluids.c: * libguile/foreign.c: * libguile/gc.h: * libguile/guardians.c: * libguile/numbers.h: * libguile/ports.c: * libguile/smob.c: * libguile/struct.c: * libguile/weak-set.c: * libguile/weak-table.c: * libguile/weak-vector.c: Use it.
Diffstat (limited to 'libguile/foreign.c')
-rw-r--r--libguile/foreign.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libguile/foreign.c b/libguile/foreign.c
index 783411897..e431c5010 100644
--- a/libguile/foreign.c
+++ b/libguile/foreign.c
@@ -152,7 +152,7 @@ scm_from_pointer (void *ptr, scm_t_pointer_finalizer finalizer)
/* Register a finalizer for the newly created instance. */
GC_finalization_proc prev_finalizer;
GC_PTR prev_finalizer_data;
- GC_REGISTER_FINALIZER_NO_ORDER (SCM2PTR (ret),
+ GC_REGISTER_FINALIZER_NO_ORDER (SCM_HEAP_OBJECT_BASE (ret),
pointer_finalizer_trampoline,
finalizer,
&prev_finalizer,
@@ -317,7 +317,7 @@ SCM_DEFINE (scm_set_pointer_finalizer_x, "set-pointer-finalizer!", 2, 0, 0,
SCM_SET_CELL_WORD_0 (pointer, SCM_CELL_WORD_0 (pointer) | (1 << 16UL));
- GC_REGISTER_FINALIZER_NO_ORDER (SCM2PTR (pointer),
+ GC_REGISTER_FINALIZER_NO_ORDER (SCM_HEAP_OBJECT_BASE (pointer),
pointer_finalizer_trampoline,
c_finalizer,
&prev_finalizer,