diff options
author | Andy Wingo <wingo@pobox.com> | 2012-07-06 16:52:54 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2012-07-06 16:52:54 +0200 |
commit | 2aed2667fce5ccb115667a36ffd368c4c3b6e9f4 (patch) | |
tree | 21c31f62bca976076b851d01104327152035e8d4 /libguile/weak-set.c | |
parent | b8bc86bce147cf280ca2a60d36c8b6493cbf11e8 (diff) | |
parent | 24dd9f6fe1449fa4de81d95ca659283c15e16931 (diff) | |
download | guile-2aed2667fce5ccb115667a36ffd368c4c3b6e9f4.tar.gz |
Merge remote-tracking branch 'origin/stable-2.0'
Conflicts:
libguile/expand.c
libguile/hashtab.c
libguile/ports.c
libguile/vectors.c
libguile/weaks.c
module/language/ecmascript/compile-tree-il.scm
module/language/tree-il/effects.scm
module/language/tree-il/fix-letrec.scm
module/language/tree-il/peval.scm
test-suite/tests/peval.test
Diffstat (limited to 'libguile/weak-set.c')
-rw-r--r-- | libguile/weak-set.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libguile/weak-set.c b/libguile/weak-set.c index 33402b548..d648dbd34 100644 --- a/libguile/weak-set.c +++ b/libguile/weak-set.c @@ -174,11 +174,11 @@ move_weak_entry (scm_t_weak_entry *from, scm_t_weak_entry *to) if (copy.key && SCM_HEAP_OBJECT_P (SCM_PACK (copy.key))) { #ifdef HAVE_GC_MOVE_DISAPPEARING_LINK - GC_move_disappearing_link ((GC_PTR) &from->key, (GC_PTR) &to->key); + GC_move_disappearing_link ((void **) &from->key, (void **) &to->key); #else - GC_unregister_disappearing_link ((GC_PTR) &from->key); - SCM_I_REGISTER_DISAPPEARING_LINK ((GC_PTR) &to->key, - (GC_PTR) to->key); + GC_unregister_disappearing_link ((void **) &from->key); + SCM_I_REGISTER_DISAPPEARING_LINK ((void **) &to->key, + to->key); #endif } } @@ -418,8 +418,8 @@ resize_set (scm_t_weak_set *set) new_entries[new_k].key = copy.key; if (SCM_HEAP_OBJECT_P (SCM_PACK (copy.key))) - SCM_I_REGISTER_DISAPPEARING_LINK ((GC_PTR) &new_entries[new_k].key, - (GC_PTR) new_entries[new_k].key); + SCM_I_REGISTER_DISAPPEARING_LINK ((void **) &new_entries[new_k].key, + (void *) new_entries[new_k].key); } } @@ -579,8 +579,8 @@ weak_set_add_x (scm_t_weak_set *set, unsigned long hash, entries[k].key = SCM_UNPACK (obj); if (SCM_HEAP_OBJECT_P (obj)) - SCM_I_REGISTER_DISAPPEARING_LINK ((GC_PTR) &entries[k].key, - (GC_PTR) SCM2PTR (obj)); + SCM_I_REGISTER_DISAPPEARING_LINK ((void **) &entries[k].key, + (void *) SCM2PTR (obj)); return obj; } @@ -631,7 +631,7 @@ weak_set_remove_x (scm_t_weak_set *set, unsigned long hash, entries[k].key = 0; if (SCM_HEAP_OBJECT_P (SCM_PACK (copy.key))) - GC_unregister_disappearing_link ((GC_PTR) &entries[k].key); + GC_unregister_disappearing_link ((void **) &entries[k].key); if (--set->n_items < set->lower) resize_set (set); |