diff options
author | Andy Wingo <wingo@pobox.com> | 2012-01-31 22:58:24 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2012-01-31 22:58:24 +0100 |
commit | 0aed71aa51e89e714de2392c2a5f44694dca77ea (patch) | |
tree | 9c99918b70d24d7cd344fcc22c34e2b7cff1e517 /libguile/weak-set.c | |
parent | 3bf3d735ac743eda1f42627d165dfd86f1178126 (diff) | |
download | guile-0aed71aa51e89e714de2392c2a5f44694dca77ea.tar.gz |
Revert "add SCM_HEAP_OBJECT_BASE"
This reverts commit 47ed8656db8800f3ad20a40eb2c4e9ef3dc891e3.
Conflicts:
libguile/foreign.c
Diffstat (limited to 'libguile/weak-set.c')
-rw-r--r-- | libguile/weak-set.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libguile/weak-set.c b/libguile/weak-set.c index 57e9e5001..626433d6b 100644 --- a/libguile/weak-set.c +++ b/libguile/weak-set.c @@ -525,7 +525,7 @@ weak_set_add_x (scm_t_weak_set *set, unsigned long hash, if (SCM_HEAP_OBJECT_P (obj)) SCM_I_REGISTER_DISAPPEARING_LINK ((GC_PTR) &entries[k].key, - (GC_PTR) SCM_HEAP_OBJECT_BASE (obj)); + (GC_PTR) SCM2PTR (obj)); return obj; } @@ -688,7 +688,7 @@ scm_c_register_weak_gc_callback (SCM obj, void (*callback) (SCM)) weak[0] = SCM_UNPACK_POINTER (obj); weak[1] = (void*)callback; - GC_GENERAL_REGISTER_DISAPPEARING_LINK (weak, SCM_HEAP_OBJECT_BASE (obj)); + GC_GENERAL_REGISTER_DISAPPEARING_LINK (weak, SCM2PTR (obj)); #ifdef HAVE_GC_SET_START_CALLBACK scm_c_hook_add (&scm_after_gc_c_hook, weak_gc_hook, weak, 0); |