Reviewed and approved by cagney@redhat.com.

	2004-02-02  Fred Fish  <fnf@redhat.com>
	* main.c (gdb_stdtarg): Move definition to group with other
	gdb_stdtarg definitions.
	* remote-sim.c (gdb_os_write_stderr): Write output to
	gdb_stdtargerr stream instead of gdb_stdtarg stream.
	(gdb_os_flush_stderr): Flush gdb_stdtargerr steam instead of
	gdb_stderr stream.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1c331b7802fbf0f140d8b5d7373a1c595a80d595..13c2ba8bd66b3133cf261de9ba45ceed455d0d5b 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2004-02-02  Fred Fish  <fnf@redhat.com>
+
+       * main.c (gdb_stdtarg): Move definition to group with other
+       gdb_stdtarg definitions.
+       * remote-sim.c (gdb_os_write_stderr): Write output to
+       gdb_stdtargerr stream instead of gdb_stdtarg stream.
+       (gdb_os_flush_stderr): Flush gdb_stdtargerr steam instead of
+       gdb_stderr stream.
+
 2004-02-01  Daniel Jacobowitz  <drow@mvista.com>
 
        * Makefile.in (mips-linux-nat.o): Update dependencies.

diff --git a/gdb/main.c b/gdb/main.c
index 303bf1c233b78932796f8fd6c2229c478260b877..e199a10d2fb56b0846e41dc4d9be05eac1bec863 100644 (file)
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -72,10 +72,10 @@ char *gdb_sysroot = 0;
 struct ui_file *gdb_stdout;
 struct ui_file *gdb_stderr;
 struct ui_file *gdb_stdlog;
-struct ui_file *gdb_stdtarg;
 struct ui_file *gdb_stdin;
 /* target IO streams */
 struct ui_file *gdb_stdtargin;
+struct ui_file *gdb_stdtarg;
 struct ui_file *gdb_stdtargerr;
 
 /* Whether to enable writing into executable and core files */

diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c
index b1dc94e0cac658afff30ad1e884c29bb8e1be3fb..243a3ae5a3d31465027787dedf96244967f15aae 100644 (file)
--- a/gdb/remote-sim.c
+++ b/gdb/remote-sim.c
@@ -221,7 +221,7 @@ gdb_os_write_stderr (host_callback *p, const char *buf, int len)
     {
       b[0] = buf[i];
       b[1] = 0;
-      fputs_unfiltered (b, gdb_stdtarg);
+      fputs_unfiltered (b, gdb_stdtargerr);
     }
   return len;
 }
@@ -231,7 +231,7 @@ gdb_os_write_stderr (host_callback *p, const char *buf, int len)
 static void
 gdb_os_flush_stderr (host_callback *p)
 {
-  gdb_flush (gdb_stderr);
+  gdb_flush (gdb_stdtargerr);
 }
 
 /* GDB version of printf_filtered callback.  */