* src/system.h (SETVBUF): Remove definition, now that the

autoconf macro, AC_FUNC_SETVBUF_REVERSED, does nothing.
* src/tee.c (tee_files): s/SETVBUF/setvbuf/.
* src/od.c (open_next_file): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 4dde0d1..75a2c58 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-12-12  Jim Meyering  <jim@meyering.net>
+
+       * src/system.h (SETVBUF): Remove definition, now that the
+       autoconf macro, AC_FUNC_SETVBUF_REVERSED, does nothing.
+       * src/tee.c (tee_files): s/SETVBUF/setvbuf/.
+       * src/od.c (open_next_file): Likewise.
+
 2006-12-09  Jim Meyering  <jim@meyering.net>
 
        * man/Makefile.am (.x.1): Make help2man use $(PACKAGE_STRING) as the

diff --git a/src/od.c b/src/od.c
index a0c2474..706a469 100644 (file)
--- a/src/od.c
+++ b/src/od.c
@@ -928,7 +928,7 @@ open_next_file (void)
   while (in_stream == NULL);
 
   if (limit_bytes_to_format & !flag_dump_strings)
-    SETVBUF (in_stream, NULL, _IONBF, 0);
+    setvbuf (in_stream, NULL, _IONBF, 0);
 
   return ok;
 }

diff --git a/src/system.h b/src/system.h
index 9cc144c..2a90913 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -389,14 +389,6 @@ readdir_ignoring_dot_and_dotdot (DIR *dirp)
     }
 }
 
-#if SETVBUF_REVERSED
-# define SETVBUF(Stream, Buffer, Type, Size) \
-    setvbuf (Stream, Type, Buffer, Size)
-#else
-# define SETVBUF(Stream, Buffer, Type, Size) \
-    setvbuf (Stream, Buffer, Type, Size)
-#endif
-
 /* Factor out some of the common --help and --version processing code.  */
 
 /* These enum values cannot possibly conflict with the option values

diff --git a/src/tee.c b/src/tee.c
index f612181..d21edbc 100644 (file)
--- a/src/tee.c
+++ b/src/tee.c
@@ -161,7 +161,7 @@ tee_files (int nfiles, const char **files)
      the first one correspond to standard output.   */
   descriptors[0] = stdout;
   files[0] = _("standard output");
-  SETVBUF (stdout, NULL, _IONBF, 0);
+  setvbuf (stdout, NULL, _IONBF, 0);
 
   for (i = 1; i <= nfiles; i++)
     {
@@ -174,7 +174,7 @@ tee_files (int nfiles, const char **files)
          ok = false;
        }
       else
-       SETVBUF (descriptors[i], NULL, _IONBF, 0);
+       setvbuf (descriptors[i], NULL, _IONBF, 0);
     }
 
   while (1)