From 8d550c12b86161cd865102f2fc0e8730c9fd59c9 Mon Sep 17 00:00:00 2001
From: Jim Meyering <jim@meyering.net>
Date: Tue, 12 Dec 2006 14:34:23 +0100
Subject: * 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.

---
 src/od.c     | 2 +-
 src/system.h | 8 --------
 src/tee.c    | 4 ++--
 3 files changed, 3 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/od.c b/src/od.c
index a0c247401..706a46925 100644
--- 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 9cc144c76..2a9091390 100644
--- 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 f612181f7..d21edbc04 100644
--- 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)
-- 
cgit v1.2.3-70-g09d2