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/foreign.c | |
| parent | b8bc86bce147cf280ca2a60d36c8b6493cbf11e8 (diff) | |
| parent | 24dd9f6fe1449fa4de81d95ca659283c15e16931 (diff) | |
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/foreign.c')
| -rw-r--r-- | libguile/foreign.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libguile/foreign.c b/libguile/foreign.c index 072b4b62b..47077f7f8 100644 --- a/libguile/foreign.c +++ b/libguile/foreign.c @@ -96,7 +96,7 @@ register_weak_reference (SCM from, SCM to) } static void -pointer_finalizer_trampoline (GC_PTR ptr, GC_PTR data) +pointer_finalizer_trampoline (void *ptr, void *data) { scm_t_pointer_finalizer finalizer = data; finalizer (SCM_POINTER_VALUE (SCM_PACK_POINTER (ptr))); |