2000-07-03 Christopher Faylor <cgf@cygnus.com>

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

diff --git a/gdb/remote-e7000.c b/gdb/remote-e7000.c
index 5e1017f4f7dc01c39ea8cb490586706fd6d1df34..6de0315008308eb8b3460cc2caf6e064fe86e3b6 100644 (file)
--- a/gdb/remote-e7000.c
+++ b/gdb/remote-e7000.c
@@ -37,7 +37,7 @@
 #include "gdbarch.h"
 #include "inferior.h"
 #include "target.h"
-#include "wait.h"
+#include "gdb_wait.h"
 #include "value.h"
 #include "command.h"
 #include <signal.h>
@@ -61,37 +61,35 @@
 #define ACK  0x06
 #define CTRLZ 0x1a
 
-extern void notice_quit PARAMS ((void));
+extern void notice_quit (void);
 
-extern void report_transfer_performance PARAMS ((unsigned long,
-                                                time_t, time_t));
+extern void report_transfer_performance (unsigned long, time_t, time_t);
 
 extern char *sh_processor_type;
 
 /* Local function declarations.  */
 
-static void e7000_close PARAMS ((int));
+static void e7000_close (int);
 
-static void e7000_fetch_register PARAMS ((int));
+static void e7000_fetch_register (int);
 
-static void e7000_store_register PARAMS ((int));
+static void e7000_store_register (int);
 
-static void e7000_command PARAMS ((char *, int));
+static void e7000_command (char *, int);
 
-static void e7000_login_command PARAMS ((char *, int));
+static void e7000_login_command (char *, int);
 
-static void e7000_ftp_command PARAMS ((char *, int));
+static void e7000_ftp_command (char *, int);
 
-static void e7000_drain_command PARAMS ((char *, int));
+static void e7000_drain_command (char *, int);
 
-static void expect PARAMS ((char *));
+static void expect (char *);
 
-static void expect_full_prompt PARAMS ((void));
+static void expect_full_prompt (void);
 
-static void expect_prompt PARAMS ((void));
+static void expect_prompt (void);
 
-static int e7000_parse_device PARAMS ((char *args, char *dev_name,
-                                      int baudrate));
+static int e7000_parse_device (char *args, char *dev_name, int baudrate);
 /* Variables. */
 
 static serial_t e7000_desc;
@@ -1580,7 +1578,7 @@ e7000_load (args, from_tty)
       perror_with_name (filename);
       return;
     }
-  old_chain = make_cleanup ((make_cleanup_func) bfd_close, pbfd);
+  old_chain = make_cleanup_bfd_close (pbfd);
 
   if (!bfd_check_format (pbfd, bfd_object))
     error ("\"%s\" is not an object file: %s", filename,