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

	* top.c (gdb_init): Don't call cli_out_new() to
	create global uiout if init_ui_hook is set.  uiout will
	have to be initialized there.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 843215bf40ac67dbdb661904d1329f942bb5ddfe..8f311d131622a2d10084819f62c6831f1c2a1b5b 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-18  Martin M. Hunt  <hunt@redhat.com>
+
+       * top.c (gdb_init): Don't call cli_out_new() to
+       create global uiout if init_ui_hook is set.  uiout will
+       have to be initialized there.
+
 2001-04-18  Andrew Cagney  <ac131313@redhat.com>
 
        * arch-utils.c: Include "regcache.h".

diff --git a/gdb/top.c b/gdb/top.c
index 785e4a66977893d6cf8a54e0741ce064eed65acb..4cb347669349ea4811f0f15a4ab0a5f0361e1928 100644 (file)
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -704,17 +704,18 @@ gdb_init (char *argv0)
 
 #ifdef UI_OUT
   /* Install the default UI */
-  uiout = cli_out_new (gdb_stdout);
-#endif
-
-#ifdef UI_OUT
-  /* All the interpreters should have had a look at things by now.
-     Initialize the selected interpreter. */
-  if (interpreter_p && !init_ui_hook)
+  if (!init_ui_hook)
     {
-      fprintf_unfiltered (gdb_stderr, "Interpreter `%s' unrecognized.\n",
-                         interpreter_p);
-      exit (1);
+      uiout = cli_out_new (gdb_stdout);
+
+      /* All the interpreters should have had a look at things by now.
+        Initialize the selected interpreter. */
+      if (interpreter_p)
+       {
+         fprintf_unfiltered (gdb_stderr, "Interpreter `%s' unrecognized.\n",
+                             interpreter_p);
+         exit (1);
+       }
     }
 #endif
 
@@ -733,8 +734,8 @@ execute_command (char *p, int from_tty)
   static int warned = 0;
   char *line;
   /* FIXME: These should really be in an appropriate header file */
-extern void serial_log_command (const char *);
-
+  extern void serial_log_command (const char *);
+  
   free_all_values ();
 
   /* Force cleanup of any alloca areas if using C alloca instead of