* ld-cris/expdyn1.d, ld-cris/expdyn5.d, ld-cris/expdyn6.d,

[deliverable/binutils-gdb.git] / gdb / ser-tcp.c

diff --git a/gdb/ser-tcp.c b/gdb/ser-tcp.c
index cef62699ae082972801269dea2e6af765fd18cf7..de8c4283744afbc89bf687f7be09d2b0e07eb825 100644 (file)
--- a/gdb/ser-tcp.c
+++ b/gdb/ser-tcp.c
@@ -38,19 +38,17 @@
 #include <netdb.h>
 #include <sys/socket.h>
 #include <netinet/tcp.h>
-#include <netinet/udp.h>
 
 #include <signal.h>
 #include "gdb_string.h"
 
 static int net_open (struct serial *scb, const char *name);
 static void net_close (struct serial *scb);
-extern int (*ui_loop_hook) (int);
 void _initialize_ser_tcp (void);
 
 /* seconds to wait for connect */
 #define TIMEOUT 15
-/* how many times per second to poll ui_loop_hook */
+/* how many times per second to poll deprecated_ui_loop_hook */
 #define POLL_INTERVAL 2
 
 /* Open a tcp socket */
@@ -134,9 +132,9 @@ net_open (struct serial *scb, const char *name)
          /* While we wait for the connect to complete 
             poll the UI so it can update or the user can 
             interrupt. */
-         if (ui_loop_hook)
+         if (deprecated_ui_loop_hook)
            {
-             if (ui_loop_hook (0))
+             if (deprecated_ui_loop_hook (0))
                {
                  errno = EINTR;
                  net_close (scb);
@@ -209,7 +207,7 @@ void
 _initialize_ser_tcp (void)
 {
   struct serial_ops *ops = XMALLOC (struct serial_ops);
-  memset (ops, sizeof (struct serial_ops), 0);
+  memset (ops, 0, sizeof (struct serial_ops));
   ops->name = "tcp";
   ops->next = 0;
   ops->open = net_open;