Revert union gdb_sockaddr_u

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

diff --git a/gdb/ser-tcp.c b/gdb/ser-tcp.c
index 648f1fb1d3175ac4f250d482ac48d8b7396afc60..9c3dcf4ee4d227013354b0898d3e6e0790ffc9ed 100644 (file)
--- a/gdb/ser-tcp.c
+++ b/gdb/ser-tcp.c
@@ -37,8 +37,6 @@
 
 #include <sys/time.h>
 
-#include "gdb_socket.h"
-
 #ifdef USE_WIN32API
 #include <winsock2.h>
 #ifndef ETIMEDOUT
@@ -47,8 +45,10 @@
 #define close(fd) closesocket (fd)
 #define ioctl ioctlsocket
 #else
+#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
+#include <sys/socket.h>
 #include <netinet/tcp.h>
 #endif
 
@@ -159,7 +159,7 @@ net_open (struct serial *scb, const char *name)
   int n, port, tmp;
   int use_udp;
   struct hostent *hostent;
-  union gdb_sockaddr_u sockaddr;
+  struct sockaddr_in sockaddr;
 #ifdef USE_WIN32API
   u_long ioarg;
 #else
@@ -199,9 +199,9 @@ net_open (struct serial *scb, const char *name)
       return -1;
     }
 
-  sockaddr.sa_in.sin_family = PF_INET;
-  sockaddr.sa_in.sin_port = htons (port);
-  memcpy (&sockaddr.sa_in.sin_addr.s_addr, hostent->h_addr,
+  sockaddr.sin_family = PF_INET;
+  sockaddr.sin_port = htons (port);
+  memcpy (&sockaddr.sin_addr.s_addr, hostent->h_addr,
          sizeof (struct in_addr));
 
  retry:
@@ -220,7 +220,7 @@ net_open (struct serial *scb, const char *name)
 
   /* Use Non-blocking connect.  connect() will return 0 if connected
      already.  */
-  n = connect (scb->fd, &sockaddr.sa, sizeof (sockaddr.sa_in));
+  n = connect (scb->fd, (struct sockaddr *) &sockaddr, sizeof (sockaddr));
 
   if (n < 0)
     {