diff options
author | Ludovic Courtès <ludo@gnu.org> | 2009-08-28 19:01:19 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2009-08-28 19:16:46 +0200 |
commit | 7af531508c5931261ff8957708642cac67bf86a5 (patch) | |
tree | bd36d27d9f7a11d954093d4121ccb9e645f5c59f /libguile/frames.c | |
parent | f86f3b5b113b4cb383c531150b13bef9b2789221 (diff) | |
parent | ce3ed0125fcfb9ad09da815f133a2320102d164c (diff) | |
download | guile-7af531508c5931261ff8957708642cac67bf86a5.tar.gz |
Merge branch 'master' into boehm-demers-weiser-gc
Conflicts:
libguile/Makefile.am
libguile/bytevectors.c
libguile/gc-card.c
libguile/gc-mark.c
libguile/programs.c
libguile/srcprop.c
libguile/srfi-14.c
libguile/symbols.c
libguile/threads.c
libguile/unif.c
libguile/vm.c
Diffstat (limited to 'libguile/frames.c')
-rw-r--r-- | libguile/frames.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libguile/frames.c b/libguile/frames.c index caa95f7d9..a6835fbb4 100644 --- a/libguile/frames.c +++ b/libguile/frames.c @@ -33,7 +33,7 @@ scm_t_bits scm_tc16_vm_frame; SCM scm_c_make_vm_frame (SCM stack_holder, SCM *fp, SCM *sp, - scm_byte_t *ip, scm_t_ptrdiff offset) + scm_t_uint8 *ip, scm_t_ptrdiff offset) { struct scm_vm_frame *p = scm_gc_malloc (sizeof (struct scm_vm_frame), "vmframe"); @@ -98,12 +98,12 @@ SCM_DEFINE (scm_vm_frame_arguments, "vm-frame-arguments", 1, 0, 0, if (!bp->nargs) return SCM_EOL; else if (bp->nrest) - ret = fp[bp->nargs - 1]; + ret = SCM_FRAME_VARIABLE (fp, bp->nargs - 1); else - ret = scm_cons (fp[bp->nargs - 1], SCM_EOL); + ret = scm_cons (SCM_FRAME_VARIABLE (fp, bp->nargs - 1), SCM_EOL); for (i = bp->nargs - 2; i >= 0; i--) - ret = scm_cons (fp[i], ret); + ret = scm_cons (SCM_FRAME_VARIABLE (fp, i), ret); return ret; } |