summaryrefslogtreecommitdiff
path: root/libguile
diff options
context:
space:
mode:
authorNeil Jerram <neil@ossau.uklinux.net>2008-02-05 23:14:21 +0000
committerNeil Jerram <neil@ossau.uklinux.net>2008-02-05 23:14:21 +0000
commitd05bcb2edee6b92e56f58ffb6b8b49d9f594ceb8 (patch)
treee9a22c43bb21dd2e56d14cff67fbb153aa09a35a /libguile
parent01be513ed1b05368074bd47200459388b38b072d (diff)
downloadguile-d05bcb2edee6b92e56f58ffb6b8b49d9f594ceb8.tar.gz
* fports.c (fport_seek): Make dependent on GUILE_USE_64_CALLS.
* _scm.h: Make definition of CHOOSE_LARGEFILE depend on GUILE_USE_64_CALLS. * configure.in (--without-64-calls): New option.
Diffstat (limited to 'libguile')
-rw-r--r--libguile/ChangeLog7
-rw-r--r--libguile/_scm.h2
-rw-r--r--libguile/fports.c2
3 files changed, 9 insertions, 2 deletions
diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index 8626580d1..cae115c79 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,10 @@
+2008-02-05 Neil Jerram <neil@ossau.uklinux.net>
+
+ * fports.c (fport_seek): Make dependent on GUILE_USE_64_CALLS.
+
+ * _scm.h: Make definition of CHOOSE_LARGEFILE depend on
+ GUILE_USE_64_CALLS.
+
2008-02-01 Neil Jerram <neil@ossau.uklinux.net>
* modules.c (the_root_module): Moved before scm_current_module.
diff --git a/libguile/_scm.h b/libguile/_scm.h
index 75413aeca..c276c07c0 100644
--- a/libguile/_scm.h
+++ b/libguile/_scm.h
@@ -114,7 +114,7 @@
-#if HAVE_STAT64
+#if GUILE_USE_64_CALLS && HAVE_STAT64
#define CHOOSE_LARGEFILE(foo,foo64) foo64
#else
#define CHOOSE_LARGEFILE(foo,foo64) foo
diff --git a/libguile/fports.c b/libguile/fports.c
index 20902d698..872dc1926 100644
--- a/libguile/fports.c
+++ b/libguile/fports.c
@@ -667,7 +667,7 @@ fport_seek_or_seek64 (SCM port, off_t_or_off64_t offset, int whence)
case on NetBSD apparently), then fport_seek_or_seek64 is right to be
fport_seek already. */
-#if HAVE_STAT64 && SIZEOF_OFF_T != SIZEOF_OFF64_T
+#if GUILE_USE_64_CALLS && HAVE_STAT64 && SIZEOF_OFF_T != SIZEOF_OFF64_T
static off_t
fport_seek (SCM port, off_t offset, int whence)
{