X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ffflush.c;h=7e707272295f5bf6b5c806962141906a919d7a08;hb=f62a2da1390a78aebe7dcbc5753ba7a2b34cf1fd;hp=a43eea7f4df63ba4d68e78b6750a80c7cabe2401;hpb=dee31b615239639303d46ded10c61bfec9e92d48;p=gnulib.git

diff --git a/lib/fflush.c b/lib/fflush.c
index a43eea7f4..7e7072722 100644
--- a/lib/fflush.c
+++ b/lib/fflush.c
@@ -28,6 +28,8 @@
 
 #include "stdio-impl.h"
 
+#include "unused-parameter.h"
+
 #undef fflush
 
 
@@ -48,7 +50,7 @@ clear_ungetc_buffer_preserving_position (FILE *fp)
 static inline void
 clear_ungetc_buffer (FILE *fp)
 {
-# if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */
+# if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */
   if (HASUB (fp))
     {
       fp_->_p += fp_->_r;
@@ -69,7 +71,7 @@ clear_ungetc_buffer (FILE *fp)
 
 #endif
 
-#if (defined __sferror || defined __DragonFly__) && defined __SNPT /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */
+#if (defined __sferror || defined __DragonFly__) && defined __SNPT /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */
 
 static inline int
 disable_seek_optimization (FILE *fp)
@@ -91,7 +93,7 @@ static inline void
 update_fpos_cache (FILE *fp _GL_UNUSED_PARAMETER,
                    off_t pos _GL_UNUSED_PARAMETER)
 {
-#if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */
+#if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */
 # if defined __CYGWIN__
   /* fp_->_offset is typed as an integer.  */
   fp_->_offset = pos;
@@ -189,7 +191,7 @@ rpl_fflush (FILE *stream)
         return result;
     }
 
-# if (defined __sferror || defined __DragonFly__) && defined __SNPT /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */
+# if (defined __sferror || defined __DragonFly__) && defined __SNPT /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */
 
     {
       /* Disable seek optimization for the next fseeko call.  This tells the