diff options
author | Stefan Jahn <stefan@lkcc.org> | 2003-05-29 14:39:13 +0000 |
---|---|---|
committer | Stefan Jahn <stefan@lkcc.org> | 2003-05-29 14:39:13 +0000 |
commit | 2e945bccca0209965dbbb1aea858f9bb7576641a (patch) | |
tree | 93140104c679a4cbbe2747f98422cefce95853c5 /libguile/filesys.c | |
parent | 42ad901d04a32e9ec7033a5ba520b3be1908f2bf (diff) | |
download | guile-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/filesys.c')
-rw-r--r-- | libguile/filesys.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libguile/filesys.c b/libguile/filesys.c index 3434756a3..91c00852f 100644 --- a/libguile/filesys.c +++ b/libguile/filesys.c @@ -1503,14 +1503,14 @@ SCM_DEFINE (scm_basename, "basename", 1, 1, 0, if (j == -1) end = i; #ifdef __MINGW32__ - while (i >= 0 && (f[i] != '/' || f[i] != '\\')) --i; + while (i >= 0 && f[i] != '/' && f[i] != '\\') --i; #else while (i >= 0 && f[i] != '/') --i; #endif /* ndef __MINGW32__ */ if (i == end) { #ifdef __MINGW32__ - if (len > 0 && (f[0] == '/' || f[i] == '\\')) + if (len > 0 && (f[0] == '/' || f[0] == '\\')) #else if (len > 0 && f[0] == '/') #endif /* ndef __MINGW32__ */ |