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/struct.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/struct.c')
-rw-r--r-- | libguile/struct.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libguile/struct.c b/libguile/struct.c index 12a884256..e8182a2fd 100644 --- a/libguile/struct.c +++ b/libguile/struct.c @@ -411,7 +411,7 @@ SCM_DEFINE (scm_struct_vtable_p, "struct-vtable?", 1, 0, 0, /* Finalization: invoke the finalizer of the struct pointed to by PTR. */ static void -struct_finalizer_trampoline (GC_PTR ptr, GC_PTR unused_data) +struct_finalizer_trampoline (void *ptr, void *unused_data) { SCM obj = PTR2SCM (ptr); scm_t_struct_finalize finalize = SCM_STRUCT_FINALIZER (obj); |