From: Nicholas Nethercote <njn@valgrind.org>
Date: Fri, 22 May 2009 00:47:08 +0000 (+0000)
Subject: Avoid struct vki_sockaddr_in in my_connect(), because it's not defined on
X-Git-Tag: svn/VALGRIND_3_5_0~619
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d256d37393fbe37ae5ab84a816ecf4bf3e8fa4c4;p=thirdparty%2Fvalgrind.git

Avoid struct vki_sockaddr_in in my_connect(), because it's not defined on
all platforms;  void* suffices.



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@10095
---

diff --git a/coregrind/m_libcfile.c b/coregrind/m_libcfile.c
index ee15c66b24..e328b4b494 100644
--- a/coregrind/m_libcfile.c
+++ b/coregrind/m_libcfile.c
@@ -575,11 +575,7 @@ Int my_socket ( Int domain, Int type, Int protocol );
 
 static
 Int my_connect ( Int sockfd, 
-#                if defined(VGO_linux)
-                   struct vki_sockaddr_in* serv_addr, 
-#                else
-                   void* serv_addr,
-#                endif
+                 /* struct vki_sockaddr_in* */ void* serv_addr,
                  Int addrlen );
 
 UInt VG_(htonl) ( UInt x )
@@ -664,8 +660,7 @@ Int VG_(connect_via_socket)( UChar* str )
    }
 		
    /* connect to server */
-   res = my_connect(sd, (struct vki_sockaddr_in *) &servAddr, 
-                        sizeof(servAddr));
+   res = my_connect(sd, &servAddr, sizeof(servAddr));
    if (res < 0) {
       /* connection failed */
       return -2;
@@ -754,12 +749,8 @@ Int my_socket ( Int domain, Int type, Int protocol )
 
 
 static
-Int my_connect ( Int sockfd,
-#                if defined(VGO_linux)
-                   struct vki_sockaddr_in* serv_addr, 
-#                else
-                   void* serv_addr,
-#                endif
+Int my_connect ( Int sockfd, 
+                 /* struct vki_sockaddr_in* */ void* serv_addr,
                  Int addrlen )
 {
 #  if defined(VGP_x86_linux) || defined(VGP_ppc32_linux) \