diff options
author | Ludovic Courtès <ludo@gnu.org> | 2010-09-06 22:24:44 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2010-09-06 22:24:44 +0200 |
commit | 2ee073587a28161dfb6b95f250be2d8a5df26cae (patch) | |
tree | 6e165113473328fdb90624301118652d60fbbba2 /libguile | |
parent | 7884975a890a461fb62178eeb3dfbb8b30b28ba2 (diff) | |
download | guile-2ee073587a28161dfb6b95f250be2d8a5df26cae.tar.gz |
Rename `make-foreign-function' to `pointer->procedure'.
* libguile/foreign.c (scm_make_foreign_function): Rename to...
(scm_pointer_to_procedure): ... this.
* libguile/foreign.h: Adjust accordingly.
* module/system/foreign.scm: Likewise.
* test-suite/standalone/test-ffi: Likewise.
* test-suite/tests/foreign.test: Likewise.
* doc/ref/api-foreign.texi: Likewise.
Diffstat (limited to 'libguile')
-rw-r--r-- | libguile/foreign.c | 6 | ||||
-rw-r--r-- | libguile/foreign.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libguile/foreign.c b/libguile/foreign.c index c36972b54..1e91661ad 100644 --- a/libguile/foreign.c +++ b/libguile/foreign.c @@ -530,7 +530,7 @@ fill_ffi_type (SCM type, ffi_type *ftype, ffi_type ***type_ptrs, *ftype = ffi_type_void; return; default: - scm_wrong_type_arg_msg ("make-foreign-function", 0, type, + scm_wrong_type_arg_msg ("pointer->procedure", 0, type, "foreign type"); } } @@ -641,7 +641,7 @@ make_cif (SCM return_type, SCM arg_types, const char *caller) } #undef FUNC_NAME -SCM_DEFINE (scm_make_foreign_function, "make-foreign-function", 3, 0, 0, +SCM_DEFINE (scm_pointer_to_procedure, "pointer->procedure", 3, 0, 0, (SCM return_type, SCM func_ptr, SCM arg_types), "Make a foreign function.\n\n" "Given the foreign void pointer @var{func_ptr}, its argument and\n" @@ -650,7 +650,7 @@ SCM_DEFINE (scm_make_foreign_function, "make-foreign-function", 3, 0, 0, "and return appropriate values.\n\n" "@var{arg_types} should be a list of foreign types.\n" "@code{return_type} should be a foreign type.") -#define FUNC_NAME s_scm_make_foreign_function +#define FUNC_NAME s_scm_pointer_to_procedure { ffi_cif *cif; diff --git a/libguile/foreign.h b/libguile/foreign.h index 1c576211f..e534d48cb 100644 --- a/libguile/foreign.h +++ b/libguile/foreign.h @@ -93,8 +93,8 @@ SCM_INTERNAL SCM scm_pointer_to_string (SCM pointer); arguments. */ -SCM_API SCM scm_make_foreign_function (SCM return_type, SCM func_ptr, - SCM arg_types); +SCM_API SCM scm_pointer_to_procedure (SCM return_type, SCM func_ptr, + SCM arg_types); SCM_API SCM scm_procedure_to_pointer (SCM return_type, SCM func_ptr, SCM arg_types); SCM_INTERNAL SCM scm_i_foreign_call (SCM foreign, const SCM *argv); |