revert 1.9. Not approved.

[deliverable/binutils-gdb.git] / gdb / remote-udi.c

diff --git a/gdb/remote-udi.c b/gdb/remote-udi.c
index eef0e1c681a7d819d25bd584a6120e281b99a589..12590f88111097fbcf6f796df9ba3ce6af56f113 100644 (file)
--- a/gdb/remote-udi.c
+++ b/gdb/remote-udi.c
@@ -1,5 +1,5 @@
 /* Remote debugging interface for AMD 29k interfaced via UDI, for GDB.
-   Copyright 1990, 1992, 1995 Free Software Foundation, Inc.
+   Copyright 1990, 1992, 1995, 2000 Free Software Foundation, Inc.
    Written by Daniel Mann.  Contributed by AMD.
 
    This file is part of GDB.
@@ -35,7 +35,7 @@
 #include "defs.h"
 #include "frame.h"
 #include "inferior.h"
-#include "wait.h"
+#include "gdb_wait.h"
 #include "value.h"
 #include <ctype.h>
 #include <fcntl.h>
@@ -1316,7 +1316,7 @@ udi_load (args, from_tty)
   /* As a convenience, pick up any symbol info that is in the program
      being loaded.  Note that we assume that the program is the``mainline'';
      if this is not always true, then this code will need to be augmented.  */
-  symbol_file_add (strtok (args, " \t"), from_tty, 0, 1, 0, 0, 0, 0);
+  symbol_file_add (strtok (args, " \t"), from_tty, NULL, 1, 0);
 
   /* Getting new symbols may change our opinion about what is
      frameless.  */
@@ -1673,7 +1673,7 @@ void
 convert32 ()
 {;
 }
-GDB_FILE *EchoFile = 0;                /* used for debugging */
+struct ui_file *EchoFile = 0;  /* used for debugging */
 int QuietMode = 0;             /* used for debugging */
 \f
 #ifdef NO_HIF_SUPPORT