diff --git a/gdb/tui/ChangeLog b/gdb/tui/ChangeLog
index 8fdc4bcdfc..3bcfa176f6 100644
--- a/gdb/tui/ChangeLog
+++ b/gdb/tui/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-25  Stephane Carrez  <stcarrez@nerim.fr>
+
+	Fix PR gdb/478
+	* tuiIO.c (tui_initialize_io): Use setvbuf since this is portable.
+
 2002-10-02  Elena Zannoni  <ezannoni@redhat.com>
 
 	* tui-hooks.c (selected_frame_level_changed_hook): Use the one
diff --git a/gdb/tui/tuiIO.c b/gdb/tui/tuiIO.c
index f70df8f474..3968a0a270 100644
--- a/gdb/tui/tuiIO.c
+++ b/gdb/tui/tuiIO.c
@@ -600,7 +600,7 @@ tui_initialize_io ()
       fprintf_unfiltered (gdb_stderr, "Cannot redirect readline output");
       exit (1);
     }
-  setlinebuf (tui_rl_outstream);
+  setvbuf (tui_rl_outstream, (char*) NULL, _IOLBF, 0);
 
 #ifdef O_NONBLOCK
   (void) fcntl (tui_readline_pipe[0], F_SETFL, O_NONBLOCK);