summaryrefslogtreecommitdiff
path: root/libguile/programs.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2010-01-05 18:50:17 +0100
committerAndy Wingo <wingo@pobox.com>2010-01-07 23:42:41 +0100
commita6029b97ea84d9e9a13d71b21213b6fd0be41e87 (patch)
tree5a60c3aebe8cdb826e24633a2712ea008171a609 /libguile/programs.c
parentf3056b42cf2ddb52cdd7de013ada33e4aa953ada (diff)
downloadguile-a6029b97ea84d9e9a13d71b21213b6fd0be41e87.tar.gz
properly integrate vm bootstrapping into init.c
* libguile/Makefile.am (modinclude_HEADERS): * libguile/vm-bootstrap.h: Remove vm-bootstrap.h. * libguile/frames.c: No more vm-bootstrap.h. * libguile/instructions.c (scm_init_instructions): * libguile/objcodes.c (scm_init_objcodes): * libguile/programs.c (scm_init_programs): No need to call scm_bootstrap_vm, init.c does that for us. * libguile/vm.c (scm_bootstrap_vm): No need call e.g. scm_bootstrap_frames, init.c does that. Remove a twice-calling guard, should be unnecessary. Don't define the load-compiled subr here. * libguile/load.c (scm_init_load): Define the load-compiled subr here. * libguile/vm.h: Declare scm_bootstrap_vm here. * libguile/init.c (scm_i_init_guile): Properly integrate VM bootstrapping into this file.
Diffstat (limited to 'libguile/programs.c')
-rw-r--r--libguile/programs.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/libguile/programs.c b/libguile/programs.c
index fdc0c32a9..d5b3b1aa4 100644
--- a/libguile/programs.c
+++ b/libguile/programs.c
@@ -22,7 +22,6 @@
#include <string.h>
#include "_scm.h"
-#include "vm-bootstrap.h"
#include "instructions.h"
#include "modules.h"
#include "programs.h"
@@ -338,8 +337,6 @@ scm_bootstrap_programs (void)
void
scm_init_programs (void)
{
- scm_bootstrap_vm ();
-
#ifndef SCM_MAGIC_SNARFER
#include "libguile/programs.x"
#endif