summaryrefslogtreecommitdiff
path: root/libguile/modules.c
diff options
context:
space:
mode:
authorStefan Jahn <stefan@lkcc.org>2003-05-29 14:39:13 +0000
committerStefan Jahn <stefan@lkcc.org>2003-05-29 14:39:13 +0000
commit2e945bccca0209965dbbb1aea858f9bb7576641a (patch)
tree93140104c679a4cbbe2747f98422cefce95853c5 /libguile/modules.c
parent42ad901d04a32e9ec7033a5ba520b3be1908f2bf (diff)
downloadguile-2e945bccca0209965dbbb1aea858f9bb7576641a.tar.gz
2003-05-29 Stefan Jahn <stefan@lkcc.org>
* configure.in: Removed -lm check and added a cached check for __libc_stack_end to get it building for mingw32 hosts. 2003-05-29 Stefan Jahn <stefan@lkcc.org> * win32-dirent.c: Use malloc() instead of scm_malloc(). * stime.c (s_scm_strftime): Add a type cast to avoid compiler warning. * posix.c (s_scm_putenv): Disable use of unsetenv() for the mingw32 build. * modules.c (s_scm_module_import_interface): Renamed local variable interface to _interface. Seems like 'interface' is a special compiler directive for the mingw32 compiler. * mkstemp.c: Provide prototype to avoid compiler warning. * load.c (s_scm_search_path): Fixed absolute and relative path detections for native Windows platforms. * gc.h, threads.h: Export some more symbols using SCM_API (necessary to build on mingw32). * gc-freelist.c ("s_scm_map_free_list", "s_scm_gc_set_debug_check_freelist_x"): Fixed use of FUNC_NAME. * fports.c (fport_fill_input): Disable use of fport_wait_for_input() on Win32 platforms. * filesys.c (s_scm_basename): Fixed __MINGW32__ code. * Makefile.am: Modified some rules for cross compiling. 2003-05-29 Stefan Jahn <stefan@lkcc.org> * raw-ltdl.c: Some more modifications for mingw32 platforms. 2003-05-29 Stefan Jahn <stefan@lkcc.org> * Makefile.am (libguile_srfi_srfi_1_la_LDFLAGS, libguile_srfi_srfi_4_la_LDFLAGS, libguile_srfi_srfi_13_14__la_LDFLAGS): Added the -no-undefined option for the mingw32 build. 2003-05-29 Stefan Jahn <stefan@lkcc.org> * standalone/Makefile.am: Setup to build on mingw32.
Diffstat (limited to 'libguile/modules.c')
-rw-r--r--libguile/modules.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/libguile/modules.c b/libguile/modules.c
index 801bd7786..fd13c516b 100644
--- a/libguile/modules.c
+++ b/libguile/modules.c
@@ -401,25 +401,25 @@ SCM_DEFINE (scm_module_import_interface, "module-import-interface", 2, 0, 0,
uses = SCM_MODULE_USES (module);
while (SCM_CONSP (uses))
{
- SCM interface = SCM_CAR (uses);
+ SCM _interface = SCM_CAR (uses);
/* 1. Check module obarray */
- SCM b = scm_hashq_ref (SCM_MODULE_OBARRAY (interface), sym, SCM_BOOL_F);
+ SCM b = scm_hashq_ref (SCM_MODULE_OBARRAY (_interface), sym, SCM_BOOL_F);
if (SCM_BOUND_THING_P (b))
- return interface;
+ return _interface;
{
- SCM binder = SCM_MODULE_BINDER (interface);
+ SCM binder = SCM_MODULE_BINDER (_interface);
if (!SCM_FALSEP (binder))
/* 2. Custom binder */
{
- b = scm_call_3 (binder, interface, sym, SCM_BOOL_F);
+ b = scm_call_3 (binder, _interface, sym, SCM_BOOL_F);
if (SCM_BOUND_THING_P (b))
- return interface;
+ return _interface;
}
}
/* 3. Search use list recursively. */
- interface = scm_module_import_interface (interface, sym);
- if (!SCM_FALSEP (interface))
- return interface;
+ _interface = scm_module_import_interface (_interface, sym);
+ if (!SCM_FALSEP (_interface))
+ return _interface;
uses = SCM_CDR (uses);
}
return SCM_BOOL_F;