diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2011-02-13 14:50:05 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2011-02-13 14:50:05 +0100 |
| commit | be90d0b6f9e79bc882b2289bf0a5ea1b3c082b3c (patch) | |
| tree | 949a3caa5a82ea2dc9d37cdee6211d8ac2632a0c /libguile/gsubr.h | |
| parent | 10b9343f04ce8ed245b8d4316805909d2821d5b1 (diff) | |
| download | guile-be90d0b6f9e79bc882b2289bf0a5ea1b3c082b3c.tar.gz | |
Add `scm_t_subr' typedef (fix bug #23681).
* libguile/__scm.h (scm_t_subr): New typedef.
* libguile/deprecated.h (scm_make_gsubr, scm_make_gsubr_with_generic,
scm_call_catching_errors): Use it.
* libguile/gsubr.h (scm_c_make_gsubr, scm_c_define_gsubr,
scm_c_define_gsubr_with_generic): Likewise.
* libguile/smob.h (scm_smob_descriptor)[apply]: Likewise.
(scm_set_smob_apply): Likewise.
* libguile/snarf.h (SCM_FUNC_CAST_ARBITRARY_ARGS): Likewise.
Diffstat (limited to 'libguile/gsubr.h')
| -rw-r--r-- | libguile/gsubr.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/libguile/gsubr.h b/libguile/gsubr.h index faa4bb0d4..5adffa4fe 100644 --- a/libguile/gsubr.h +++ b/libguile/gsubr.h @@ -3,7 +3,8 @@ #ifndef SCM_GSUBR_H #define SCM_GSUBR_H -/* Copyright (C) 1995,1996,1998,2000,2001, 2006, 2008, 2009, 2010 Free Software Foundation, Inc. +/* Copyright (C) 1995, 1996, 1998, 2000, 2001, 2006, 2008, 2009, + * 2010, 2011 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 @@ -59,16 +60,16 @@ SCM_API SCM scm_subr_objcode_trampoline (unsigned int nreq, -SCM_API SCM scm_c_make_gsubr (const char *name, - int req, int opt, int rst, SCM (*fcn) ()); +SCM_API SCM scm_c_make_gsubr (const char *name, + int req, int opt, int rst, scm_t_subr fcn); SCM_API SCM scm_c_make_gsubr_with_generic (const char *name, int req, int opt, int rst, - SCM (*fcn) (), SCM *gf); -SCM_API SCM scm_c_define_gsubr (const char *name, - int req, int opt, int rst, SCM (*fcn) ()); + scm_t_subr fcn, SCM *gf); +SCM_API SCM scm_c_define_gsubr (const char *name, + int req, int opt, int rst, scm_t_subr fcn); SCM_API SCM scm_c_define_gsubr_with_generic (const char *name, int req, int opt, int rst, - SCM (*fcn) (), SCM *gf); + scm_t_subr fcn, SCM *gf); SCM_INTERNAL void scm_init_gsubr (void); |