From 4e95eaff0c7ce4e5cbaa91cbba0f013a77545a4f Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 19 Dec 2009 12:30:24 +0100 Subject: [PATCH] fflush: tweak --- ChangeLog | 7 +++++++ lib/fflush.c | 6 ++++++ lib/fseeko.c | 6 ++++++ 3 files changed, 19 insertions(+) diff --git a/ChangeLog b/ChangeLog index 43c0258166..d97d2118cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ + +2009-12-19 Bruno Haible + + fflush: tweak + * lib/fflush.c (update_fpos_cache): Don't use fpos_t on Cygwin. + * lib/fseeko.c (rpl_fseeko): Likewise. + 2009-12-16 José E. Marchesi (tiny change) * lib/gl_list.h: Fix typo in comment. diff --git a/lib/fflush.c b/lib/fflush.c index d823a342c3..573706236e 100644 --- a/lib/fflush.c +++ b/lib/fflush.c @@ -91,6 +91,11 @@ static inline void update_fpos_cache (FILE *fp, off_t pos) { #if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */ +# if defined __CYGWIN__ + /* fp_->_offset is typed as an integer. */ + fp_->_offset = pos; +# else + /* fp_->_offset is an fpos_t. */ /* Use a union, since on NetBSD, the compilation flags determine whether fpos_t is typedef'd to off_t or a struct containing a single off_t member. */ @@ -101,6 +106,7 @@ update_fpos_cache (FILE *fp, off_t pos) } u; u.o = pos; fp_->_offset = u.f; +# endif fp_->_flags |= __SOFF; #endif } diff --git a/lib/fseeko.c b/lib/fseeko.c index 91b853d3ab..0a1a05ec7f 100644 --- a/lib/fseeko.c +++ b/lib/fseeko.c @@ -110,6 +110,11 @@ rpl_fseeko (FILE *fp, off_t offset, int whence) #if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ fp->_flags &= ~_IO_EOF_SEEN; #elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */ +# if defined __CYGWIN__ + /* fp_->_offset is typed as an integer. */ + fp_->_offset = pos; +# else + /* fp_->_offset is an fpos_t. */ { /* Use a union, since on NetBSD, the compilation flags determine whether fpos_t is typedef'd to off_t or a struct @@ -122,6 +127,7 @@ rpl_fseeko (FILE *fp, off_t offset, int whence) u.o = pos; fp_->_offset = u.f; } +# endif fp_->_flags |= __SOFF; fp_->_flags &= ~__SEOF; #elif defined __EMX__ /* emx+gcc */ -- 2.30.2