diff options
author | Andy Wingo <wingo@pobox.com> | 2012-01-30 18:52:46 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2012-01-30 18:52:46 +0100 |
commit | 252acfe8e70ac4c7d325588ffea1905fcf6f86b2 (patch) | |
tree | e31cae9d145548b86cba6764d0943329a4ef64d1 /libguile/foreign.c | |
parent | 855db1905d56efcdf91ae51a9e80990f79030eae (diff) | |
parent | 3d51e57cfb0404db568a6adfde2a346d3fd9907e (diff) | |
download | guile-252acfe8e70ac4c7d325588ffea1905fcf6f86b2.tar.gz |
Merge commit '3d51e57cfb0404db568a6adfde2a346d3fd9907e'
Conflicts:
libguile/foreign.c
libguile/hashtab.c
module/ice-9/psyntax-pp.scm
module/language/tree-il/compile-glil.scm
Diffstat (limited to 'libguile/foreign.c')
-rw-r--r-- | libguile/foreign.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libguile/foreign.c b/libguile/foreign.c index 445ce0289..851cdedd5 100644 --- a/libguile/foreign.c +++ b/libguile/foreign.c @@ -316,8 +316,6 @@ SCM_DEFINE (scm_set_pointer_finalizer_x, "set-pointer-finalizer!", 2, 0, 0, c_finalizer = SCM_POINTER_VALUE (finalizer); - SCM_SET_CELL_WORD_0 (pointer, SCM_CELL_WORD_0 (pointer) | (1 << 16UL)); - GC_REGISTER_FINALIZER_NO_ORDER (SCM_HEAP_OBJECT_BASE (pointer), pointer_finalizer_trampoline, c_finalizer, |