diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2010-07-27 14:54:53 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2010-07-28 12:24:25 +0200 |
| commit | 5b46a8c2c8f41581dd5576c8dcc06e8bde8cd849 (patch) | |
| tree | 27af561d2cf6cd08dee3ff78c19d281ecce626e4 /libguile/gsubr.c | |
| parent | 9defb64118774c8f1a1f6af05d6f1705e7a40619 (diff) | |
| download | guile-5b46a8c2c8f41581dd5576c8dcc06e8bde8cd849.tar.gz | |
Use "pointer" instead of "foreign" when dealing with wrapped pointers.
* libguile/foreign.h (scm_t_foreign_finalizer): Rename to...
(scm_t_pointer_finalizer): ... this.
(SCM_FOREIGN_P): Rename to...
(SCM_POINTER_P): this.
(SCM_VALIDATE_FOREIGN): Rename to...
(SCM_VALIDATE_POINTER): ... this.
(SCM_FOREIGN_HAS_FINALIZER): Rename to...
(SCM_POINTER_HAS_FINALIZER): ... this.
(scm_take_foreign_pointer): Rename to...
(scm_from_pointer): ... this.
(scm_foreign_address): Rename to...
(scm_pointer_address): ... this.
(scm_foreign_to_bytevector): Rename to...
(scm_pointer_to_bytevector): ... this.
(scm_foreign_set_finalizer_x): Rename to...
(scm_set_pointer_finalizer_x): ... this.
(scm_bytevector_to_foreign): Rename to...
(scm_bytevector_to_pointer): ... this.
(scm_i_foreign_print): Rename to...
(scm_i_pointer_print): ... this.
* libguile/foreign.c: Update accordingly.
* libguile/tags.h (scm_tc7_foreign): Rename to...
(scm_tc7_pointer): ... this.
* libguile/foreign.c, libguile/deprecated.c, libguile/dynl.c,
libguile/evalext.c, libguile/gc.c, libguile/goops.c, libguile/gsubr.c,
libguile/gsubr.h, libguile/print.c, libguile/snarf.h,
libguile/vm-i-system.c, module/system/foreign.scm,
test-suite/standalone/test-ffi, test-suite/tests/foreign.test: Update
accordingly.
Diffstat (limited to 'libguile/gsubr.c')
| -rw-r--r-- | libguile/gsubr.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libguile/gsubr.c b/libguile/gsubr.c index ed8febd7b..ef3ad232b 100644 --- a/libguile/gsubr.c +++ b/libguile/gsubr.c @@ -793,12 +793,11 @@ create_gsubr (int define, const char *name, /* make objtable */ sname = scm_from_locale_symbol (name); table = scm_c_make_vector (generic_loc ? 3 : 2, SCM_UNDEFINED); - SCM_SIMPLE_VECTOR_SET (table, 0, - scm_take_foreign_pointer (fcn, NULL)); + SCM_SIMPLE_VECTOR_SET (table, 0, scm_from_pointer (fcn, NULL)); SCM_SIMPLE_VECTOR_SET (table, 1, sname); if (generic_loc) SCM_SIMPLE_VECTOR_SET (table, 2, - scm_take_foreign_pointer (generic_loc, NULL)); + scm_from_pointer (generic_loc, NULL)); /* make program */ ret = scm_make_program (scm_subr_objcode_trampoline (nreq, nopt, rest), |