diff options
author | Ludovic Courtès <ludo@gnu.org> | 2009-11-01 18:17:31 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2009-11-01 18:17:31 +0100 |
commit | 731dd0ce191bf4f3ba8fedfe0e08c0e67a966ce4 (patch) | |
tree | dd1ad47fdceebb013c42dc9b87c03c2fa5d79c0a /libguile/weaks.c | |
parent | b4246e5b2235bd01a24a5069ed683fc3c0f6f18c (diff) | |
parent | 5f236208d0d864546e59afa0f5a11c9b3ba14b10 (diff) | |
download | guile-731dd0ce191bf4f3ba8fedfe0e08c0e67a966ce4.tar.gz |
Merge branch 'bdw-gc-static-alloc'
Conflicts:
acinclude.m4
libguile/__scm.h
libguile/bdw-gc.h
libguile/eval.c
Diffstat (limited to 'libguile/weaks.c')
-rw-r--r-- | libguile/weaks.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libguile/weaks.c b/libguile/weaks.c index abe929254..913166ffd 100644 --- a/libguile/weaks.c +++ b/libguile/weaks.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995,1996,1998,2000,2001, 2003, 2006, 2008 Free Software Foundation, Inc. +/* Copyright (C) 1995,1996,1998,2000,2001, 2003, 2006, 2008, 2009 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 @@ -65,8 +65,8 @@ scm_weak_car_pair (SCM car, SCM cdr) if (SCM_NIMP (car)) { /* Weak car cells make sense iff the car is non-immediate. */ - GC_GENERAL_REGISTER_DISAPPEARING_LINK ((GC_PTR)&cell->word_0, - (GC_PTR)SCM_UNPACK (car)); + SCM_I_REGISTER_DISAPPEARING_LINK ((GC_PTR) &cell->word_0, + (GC_PTR) SCM_UNPACK (car)); } return (SCM_PACK (cell)); @@ -86,8 +86,8 @@ scm_weak_cdr_pair (SCM car, SCM cdr) if (SCM_NIMP (cdr)) { /* Weak cdr cells make sense iff the cdr is non-immediate. */ - GC_GENERAL_REGISTER_DISAPPEARING_LINK ((GC_PTR)&cell->word_1, - (GC_PTR)SCM_UNPACK (cdr)); + SCM_I_REGISTER_DISAPPEARING_LINK ((GC_PTR) &cell->word_1, + (GC_PTR) SCM_UNPACK (cdr)); } return (SCM_PACK (cell)); @@ -105,13 +105,13 @@ scm_doubly_weak_pair (SCM car, SCM cdr) if (SCM_NIMP (car)) { - GC_GENERAL_REGISTER_DISAPPEARING_LINK ((GC_PTR)&cell->word_0, - (GC_PTR)SCM_UNPACK (car)); + SCM_I_REGISTER_DISAPPEARING_LINK ((GC_PTR) &cell->word_0, + (GC_PTR) SCM_UNPACK (car)); } if (SCM_NIMP (cdr)) { - GC_GENERAL_REGISTER_DISAPPEARING_LINK ((GC_PTR)&cell->word_1, - (GC_PTR)SCM_UNPACK (cdr)); + SCM_I_REGISTER_DISAPPEARING_LINK ((GC_PTR) &cell->word_1, + (GC_PTR) SCM_UNPACK (cdr)); } return (SCM_PACK (cell)); |