diff options
author | Andy Wingo <wingo@pobox.com> | 2017-09-25 22:18:02 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2017-09-25 22:18:13 +0200 |
commit | 84259f54e31064851c82031080f894e2099584a6 (patch) | |
tree | 76f3c8788046faaad39525330ff77d22e63f345d /libguile/struct.h | |
parent | 9211981524df0d263c64fc33d3ea0711fc8b9112 (diff) | |
parent | a74d4ee4f6e062ff640f2532c9cfc9977bb68a49 (diff) | |
download | guile-84259f54e31064851c82031080f894e2099584a6.tar.gz |
Merge 'stable-2.2'
Resolve conflicts by removing capability of struct-ref / struct-set! to
access unboxed slots.
Diffstat (limited to 'libguile/struct.h')
-rw-r--r-- | libguile/struct.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libguile/struct.h b/libguile/struct.h index 58228daa1..53ef4befe 100644 --- a/libguile/struct.h +++ b/libguile/struct.h @@ -163,6 +163,8 @@ SCM_API SCM scm_make_vtable (SCM fields, SCM printer); SCM_INTERNAL SCM scm_i_make_vtable_vtable (SCM fields); SCM_API SCM scm_struct_ref (SCM handle, SCM pos); SCM_API SCM scm_struct_set_x (SCM handle, SCM pos, SCM val); +SCM_API SCM scm_struct_ref_unboxed (SCM handle, SCM pos); +SCM_API SCM scm_struct_set_x_unboxed (SCM handle, SCM pos, SCM val); SCM_API SCM scm_struct_vtable (SCM handle); SCM_API SCM scm_struct_vtable_name (SCM vtable); SCM_API SCM scm_set_struct_vtable_name_x (SCM vtable, SCM name); |