$NetBSD$

--- gdb/mi/mi-main.c.orig	2004-10-20 17:13:36.000000000 -0600
+++ gdb/mi/mi-main.c
@@ -779,7 +779,7 @@ mi_cmd_data_read_memory (char *command, 
   static struct mi_opt opts[] =
   {
     {"o", OFFSET_OPT, 1},
-    0
+    {0}
   };
 
   while (1)
@@ -981,7 +981,7 @@ mi_cmd_data_write_memory (char *command,
   static struct mi_opt opts[] =
   {
     {"o", OFFSET_OPT, 1},
-    0
+    {0}
   };
 
   while (1)
@@ -1145,7 +1145,6 @@ mi_execute_command (char *cmd, int from_
 {
   struct mi_parse *command;
   struct captured_mi_execute_command_args args;
-  struct ui_out *saved_uiout = uiout;
   int result;
 
   /* This is to handle EOF (^D). We just quit gdb. */
@@ -1173,7 +1172,6 @@ mi_execute_command (char *cmd, int from_
       if (args.action == EXECUTE_COMMAND_DISPLAY_ERROR || result < 0)
 	{
 	  char *msg = error_last_message ();
-	  struct cleanup *cleanup = make_cleanup (xfree, msg);
 	  /* The command execution failed and error() was called
 	     somewhere */
 	  fputs_unfiltered (command->token, raw_stdout);
