fflush: tweak

diff --git a/ChangeLog b/ChangeLog
index 43c02581663e7a014cbea1d274a9daf68c715168..d97d2118cc53db1814db5c8c2e6d7352b96aa437 100644 (file)
--- 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.

diff --git a/lib/fflush.c b/lib/fflush.c
index d823a342c3237f409c1fefc97ff22499d8529121..573706236ed6a75d1ab1527bba7a760c5d0f40b3 100644 (file)
--- 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 91b853d3ab77c4c7b06ac07a0f6326b9904ca021..0a1a05ec7f21d5cbe1e9120908120ef5862ee49b 100644 (file)
--- 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 */