Mercurial > hg > octave-lojdl > gnulib-hg
changeset 12459:717d6fde6006
fflush: tweak
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Sat, 19 Dec 2009 12:30:24 +0100 |
| parents | fd1286c1d1b9 |
| children | 282eecca2301 |
| files | ChangeLog lib/fflush.c lib/fseeko.c |
| diffstat | 3 files changed, 19 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ + +2009-12-19 Bruno Haible <bruno@clisp.org> + + 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 <jemarch@gnu.org> (tiny change) * lib/gl_list.h: Fix typo in comment.
--- a/lib/fflush.c +++ b/lib/fflush.c @@ -91,6 +91,11 @@ 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 @@ } u; u.o = pos; fp_->_offset = u.f; +# endif fp_->_flags |= __SOFF; #endif }
--- a/lib/fseeko.c +++ b/lib/fseeko.c @@ -110,6 +110,11 @@ #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 @@ u.o = pos; fp_->_offset = u.f; } +# endif fp_->_flags |= __SOFF; fp_->_flags &= ~__SEOF; #elif defined __EMX__ /* emx+gcc */