summaryrefslogtreecommitdiff
path: root/libguile/vm.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2012-01-30 18:52:46 +0100
committerAndy Wingo <wingo@pobox.com>2012-01-30 18:52:46 +0100
commit252acfe8e70ac4c7d325588ffea1905fcf6f86b2 (patch)
treee31cae9d145548b86cba6764d0943329a4ef64d1 /libguile/vm.c
parent855db1905d56efcdf91ae51a9e80990f79030eae (diff)
parent3d51e57cfb0404db568a6adfde2a346d3fd9907e (diff)
downloadguile-252acfe8e70ac4c7d325588ffea1905fcf6f86b2.tar.gz
Merge commit '3d51e57cfb0404db568a6adfde2a346d3fd9907e'
Conflicts: libguile/foreign.c libguile/hashtab.c module/ice-9/psyntax-pp.scm module/language/tree-il/compile-glil.scm
Diffstat (limited to 'libguile/vm.c')
-rw-r--r--libguile/vm.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libguile/vm.c b/libguile/vm.c
index 859658816..e386202ad 100644
--- a/libguile/vm.c
+++ b/libguile/vm.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001, 2009, 2010, 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2009, 2010, 2011, 2012 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
@@ -280,7 +280,8 @@ vm_reinstate_partial_continuation (SCM vm, SCM cont, SCM intwinds,
cp = SCM_VM_CONT_DATA (cont);
base = SCM_FRAME_UPPER_ADDRESS (vp->fp) + 1;
-#define RELOC(scm_p) (scm_p + cp->reloc + (base - cp->stack_base))
+#define RELOC(scm_p) \
+ (((SCM *) (scm_p)) + cp->reloc + (base - cp->stack_base))
if ((base - vp->stack_base) + cp->stack_size + n + 1 > vp->stack_size)
scm_misc_error ("vm-engine",