From 8bfa4b48a39376ac056a7811f23efcd5f9144009 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Wed, 1 Jan 2020 13:18:03 -0800 Subject: sysif.h: remove dependency on off_t. The sysif.h header breaks on some systems because it references off_t, which requires . But the off_t materials in this header are unnecessary; we can remove them. * sysif.c (off_t_num, num_off_t): Extern functions become static, and are wrapped with #if HAVE_FSEEKO. These functions are only called from sysif.c, only from code relying on fseeko. * sysif.h (OFF_T_MAX, OFF_T_MIN): Macros not used anywhere are removed. (off_t_num, num_off_t): Declarations removed. --- sysif.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'sysif.c') diff --git a/sysif.c b/sysif.c index 6d742b35..aa36c3a6 100644 --- a/sysif.c +++ b/sysif.c @@ -1492,7 +1492,9 @@ static val crypt_wrap(val wkey, val wsalt) #endif -off_t off_t_num(val num, val self) +#if HAVE_FSEEKO + +static off_t off_t_num(val num, val self) { switch (CHAR_BIT * sizeof(off_t)) { case 32: @@ -1504,7 +1506,7 @@ off_t off_t_num(val num, val self) } } -val num_off_t(off_t off) +static val num_off_t(off_t off) { if (sizeof (off_t) <= sizeof (cnum)) { return num(off); @@ -1517,6 +1519,8 @@ val num_off_t(off_t off) } } +#endif + val stdio_ftell(FILE *f) { #if HAVE_FSEEKO -- cgit v1.2.3