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-vector.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-vector.c')
| -rw-r--r-- | libguile/weak-vector.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libguile/weak-vector.c b/libguile/weak-vector.c index 23bc386d4..3e90b3d57 100644 --- a/libguile/weak-vector.c +++ b/libguile/weak-vector.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995,1996,1998,2000,2001, 2003, 2006, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +/* Copyright (C) 1995,1996,1998,2000,2001, 2003, 2006, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -171,13 +171,13 @@ scm_c_weak_vector_set_x (SCM wv, size_t k, SCM x) elts = SCM_I_VECTOR_WELTS (wv); if (prev && SCM_HEAP_OBJECT_P (SCM_PACK_POINTER (prev))) - GC_unregister_disappearing_link ((GC_PTR) &elts[k]); + GC_unregister_disappearing_link ((void **) &elts[k]); elts[k] = x; if (SCM_HEAP_OBJECT_P (x)) - SCM_I_REGISTER_DISAPPEARING_LINK ((GC_PTR) &elts[k], - (GC_PTR) SCM2PTR (x)); + SCM_I_REGISTER_DISAPPEARING_LINK ((void **) &elts[k], + SCM2PTR (x)); } |