diff options
author | Ludovic Courtès <ludo@gnu.org> | 2009-02-14 17:32:46 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2009-02-14 17:32:46 +0100 |
commit | f7a1ab8b946e03f6ad5ccdecba5e8d69b3ce0a1a (patch) | |
tree | be17320f40e9cfd935238883dee59667cf4bf5bc /libguile/gsubr.c | |
parent | 63385df2fdc2f9bc70804383f071f2fb74743a86 (diff) | |
parent | fe11efeebaa2ebb7bf0fe8bc46a29c152ead2509 (diff) | |
download | guile-f7a1ab8b946e03f6ad5ccdecba5e8d69b3ce0a1a.tar.gz |
Merge branch 'master' into boehm-demers-weiser-gc
Conflicts:
libguile/gc-mark.c
libguile/procs.c
libguile/procs.h
libguile/threads.c
libguile/threads.h
Diffstat (limited to 'libguile/gsubr.c')
-rw-r--r-- | libguile/gsubr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libguile/gsubr.c b/libguile/gsubr.c index be5c34271..fdb70ed92 100644 --- a/libguile/gsubr.c +++ b/libguile/gsubr.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2006, 2008 Free Software Foundation, Inc. +/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 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 @@ -75,13 +75,13 @@ create_gsubr (int define, const char *name, subr = scm_c_make_subr (name, scm_tc7_lsubr_2, fcn); create_subr: if (define) - scm_define (SCM_SUBR_ENTRY(subr).name, subr); + scm_define (SCM_SNAME (subr), subr); return subr; default: { SCM cclo = scm_makcclo (scm_f_gsubr_apply, 3L); SCM subr = scm_c_make_subr (name, scm_tc7_subr_0, fcn); - SCM sym = SCM_SUBR_ENTRY(subr).name; + SCM sym = SCM_SNAME (subr); if (SCM_GSUBR_MAX < req + opt + rst) { fprintf (stderr, @@ -151,7 +151,7 @@ create_gsubr_with_generic (int define, subr = scm_c_make_subr_with_generic (name, scm_tc7_lsubr_2, fcn, gf); create_subr: if (define) - scm_define (SCM_SUBR_ENTRY(subr).name, subr); + scm_define (SCM_SNAME (subr), subr); return subr; default: ; |