2001-04-04 Martin M. Hunt <hunt@redhat.com>

	* main.c (captured_main): For GDBtk, don't use tui_fileopen().
	Handle all stream setup in gdbtk_init

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b9f8a509867cac57cb04772fae4dceb98bfaadad..47ce9fce38b2792b999534f8563d90a1833f4394 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2001-04-04  Martin M. Hunt  <hunt@redhat.com>
+
+       * main.c (captured_main): For GDBtk, don't use tui_fileopen().
+       Handle all stream setup in gdbtk_init
+
 2001-04-04  Mark Kettenis  <kettenis@gnu.org>
 
        * i386-tdep.c (i386_extract_return_value): Don't return the return

diff --git a/gdb/main.c b/gdb/main.c
index 00767e1c96894e3e1729d234bdc4a7b57046c43f..2b70712d130115a9eff111fc99f45d2b30346965 100644 (file)
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -35,7 +35,8 @@
 #include "gdb_string.h"
 #include "event-loop.h"
 #include "ui-out.h"
-#if defined (TUI) || defined (GDBTK)
+
+#if defined (TUI)
 /* FIXME: cagney/2000-01-31: This #include is to allow older code such
    as that found in the TUI to continue to build. */
 #include "tui/tui-file.h"
@@ -199,10 +200,7 @@ captured_main (void *data)
   getcwd (gdb_dirbuf, sizeof (gdb_dirbuf));
   current_directory = gdb_dirbuf;
 
-#if defined (TUI) || defined (GDBTK)
-  /* Older code uses the tui_file and fputs_unfiltered_hook().  It
-     should be using a customized UI_FILE object and re-initializing
-     within its own _initialize function.  */
+#if defined (TUI)
   gdb_stdout = tui_fileopen (stdout);
   gdb_stderr = tui_fileopen (stderr);
   gdb_stdlog = gdb_stdout;     /* for moment */