From 68ec6062cec5154eaeffa883165c9d4e378df53f Mon Sep 17 00:00:00 2001 From: Jim Blandy Date: Thu, 5 Sep 1996 16:51:34 +0000 Subject: [PATCH] Move code to initialize and search %load-path from ice-9 to C code, so we can use the load-path to find the ice-9 boot code; this makes it easier to run Guile without installing it. See corresponding changes in guile/Makefile.in. * feature.c: Move stuff concerned with the load path to load.c. (scm_compiled_library_path): Deleted. Don't #include libpath.h here. * feature.h: Don't mention scm_compiled_library_path. * load.c: #include "libpath.h" here, as well as , , and (if present). (R_OK): #define if the system hasn't deigned to. (scm_loc_load_path): New variable. (scm_init_load_path, scm_sys_search_load_path, scm_sys_try_load_path): New functions. (scm_init_load): Initialize scm_loc_load_path to point to the value cell of the Scheme %load-path variable. * load.h: Add declarations for scm_sys_search_load_path, scm_sys_try_load_path. * init.c: Call scm_init_load_path. * Makefile.in (feature.o, load.o): Dependencies updated. * load.c, load.h: Rewrite using PROTO macro. --- libguile/load.h | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/libguile/load.h b/libguile/load.h index eab41b173..b6f0d7c89 100644 --- a/libguile/load.h +++ b/libguile/load.h @@ -46,17 +46,10 @@ -#ifdef __STDC__ -extern SCM scm_sys_try_load (SCM filename, SCM casep, SCM sharp); -extern void scm_init_load (void); - -#else /* STDC */ -extern SCM scm_sys_try_load (); -extern void scm_init_load (); - -#endif /* STDC */ - - - +extern void scm_init_load_path PROTO ((void)); +extern SCM scm_sys_try_load PROTO ((SCM filename, SCM casep, SCM sharp)); +extern SCM scm_sys_search_load_path PROTO ((SCM filename)); +extern SCM scm_sys_try_load_path PROTO ((SCM filename, SCM casep, SCM sharp)); +extern void scm_init_load PROTO ((void)); #endif /* LOADH */