Partly revert r10044 -- do use struct vki_sockaddr, and define it for AIX.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@10096
This commit is contained in:
Nicholas Nethercote 2009-05-22 00:52:14 +00:00
parent d256d37393
commit de5e58f35a

View File

@ -564,9 +564,13 @@ Int VG_(mkstemp) ( HChar* part_of_name, /*OUT*/HChar* fullname )
/* ---------------------------------------------------------------------
Socket-related stuff. This is very Linux-kernel specific.
Socket-related stuff.
------------------------------------------------------------------ */
#if defined(VGO_aix5)
struct vki_sockaddr_in;
#endif
static
Int parse_inet_addr_and_port ( UChar* str, UInt* ip_addr, UShort* port );
@ -574,9 +578,7 @@ static
Int my_socket ( Int domain, Int type, Int protocol );
static
Int my_connect ( Int sockfd,
/* struct vki_sockaddr_in* */ void* serv_addr,
Int addrlen );
Int my_connect ( Int sockfd, struct vki_sockaddr_in* serv_addr, Int addrlen );
UInt VG_(htonl) ( UInt x )
{
@ -749,9 +751,7 @@ Int my_socket ( Int domain, Int type, Int protocol )
static
Int my_connect ( Int sockfd,
/* struct vki_sockaddr_in* */ void* serv_addr,
Int addrlen )
Int my_connect ( Int sockfd, struct vki_sockaddr_in* serv_addr, Int addrlen )
{
# if defined(VGP_x86_linux) || defined(VGP_ppc32_linux) \
|| defined(VGP_ppc64_linux)