Merge commit 'd360671c1cca335600079f1c5714572d1c2e676d'

[bpt/guile.git] / libguile / vm.c

diff --git a/libguile/vm.c b/libguile/vm.c
index 0ccc9f1..5a69589 100644 (file)
--- a/libguile/vm.c
+++ b/libguile/vm.c
@@ -42,11 +42,10 @@
 #include "instructions.h"
 #include "loader.h"
 #include "programs.h"
+#include "simpos.h"
 #include "vm.h"
 #include "vm-builtins.h"
 
-#include "private-gc.h" /* scm_getenv_int */
-
 static int vm_default_engine = SCM_VM_REGULAR_ENGINE;
 
 /* Unfortunately we can't snarf these: snarfed things are only loaded up from
@@ -167,7 +166,6 @@ static void vm_dispatch_push_continuation_hook (struct scm_vm *vp) SCM_NOINLINE;
 static void vm_dispatch_pop_continuation_hook (struct scm_vm *vp, SCM *old_fp) SCM_NOINLINE;
 static void vm_dispatch_next_hook (struct scm_vm *vp) SCM_NOINLINE;
 static void vm_dispatch_abort_hook (struct scm_vm *vp) SCM_NOINLINE;
-static void vm_dispatch_restore_continuation_hook (struct scm_vm *vp) SCM_NOINLINE;
 
 static void
 vm_dispatch_hook (struct scm_vm *vp, int hook_num, SCM *argv, int n)
@@ -258,10 +256,6 @@ static void vm_dispatch_abort_hook (struct scm_vm *vp)
                            &SCM_FRAME_LOCAL (vp->fp, 1),
                            SCM_FRAME_NUM_LOCALS (vp->fp, vp->sp) - 1);
 }
-static void vm_dispatch_restore_continuation_hook (struct scm_vm *vp)
-{
-  return vm_dispatch_hook (vp, SCM_VM_RESTORE_CONTINUATION_HOOK, NULL, 0);
-}
 
 static void
 vm_abort (struct scm_vm *vp, SCM tag,
@@ -1025,15 +1019,6 @@ SCM_DEFINE (scm_vm_abort_continuation_hook, "vm-abort-continuation-hook", 0, 0,
 }
 #undef FUNC_NAME
 
-SCM_DEFINE (scm_vm_restore_continuation_hook, "vm-restore-continuation-hook", 0, 0, 0,
-           (void),
-           "")
-#define FUNC_NAME s_scm_vm_restore_continuation_hook
-{
-  VM_DEFINE_HOOK (SCM_VM_RESTORE_CONTINUATION_HOOK);
-}
-#undef FUNC_NAME
-
 SCM_DEFINE (scm_vm_trace_level, "vm-trace-level", 0, 0, 0,
            (void),
            "")