* config/sparc/nm-linux.h: Include config/nm-linux.h.

[deliverable/binutils-gdb.git] / gdb / sparcl-tdep.c

diff --git a/gdb/sparcl-tdep.c b/gdb/sparcl-tdep.c
index d6fa160c303ca002f7caef15c2ed8dac9b1b55db..aaf6e30daeaae043fbcc290badf36e4a5f14ab74 100644 (file)
--- a/gdb/sparcl-tdep.c
+++ b/gdb/sparcl-tdep.c
@@ -28,7 +28,6 @@
 #if (!defined(__GO32__) && !defined(_WIN32)) || defined(__CYGWIN32__)
 #define HAVE_SOCKETS
 #include <sys/time.h>
-#include <unistd.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netdb.h>
@@ -45,7 +44,7 @@ static int udp_fd = -1;
 
 static serial_t open_tty PARAMS ((char *name));
 static int send_resp PARAMS ((serial_t desc, char c));
-static void close_tty PARAMS ((int ignore));
+static void close_tty (void * ignore);
 #ifdef HAVE_SOCKETS
 static int recv_udp_buf PARAMS ((int fd, unsigned char *buf, int len, int timeout));
 static int send_udp_buf PARAMS ((int fd, unsigned char *buf, int len));
@@ -359,8 +358,7 @@ send_resp (desc, c)
 }
 
 static void
-close_tty (ignore)
-     int ignore;
+close_tty (void *ignore)
 {
   if (!remote_desc)
     return;
@@ -481,7 +479,7 @@ or: target sparclite udp host");
     {
       remote_desc = open_tty (p);
 
-      old_chain = make_cleanup ((make_cleanup_func) close_tty, 0);
+      old_chain = make_cleanup (close_tty, 0 /*ignore*/);
 
       c = send_resp (remote_desc, 0x00);
 
@@ -615,7 +613,7 @@ download (target_name, args, from_tty, write_routine, start_routine)
       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,