From 6f0ea379033c4541b3e93e87579b9a184ded58ac Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 27 Jan 2001 21:26:25 +0000 Subject: Update. * conform/data/sys/socket.h-data: Fix typos. Correct getsockopt, recvfrom, send, and socketpair prototypes. Add allow lines. * socket/sys/socket.h: Include . Don't use fancy __SOCKADDR_ARG definition unless __USE_GNU. Fix type of second parameter of listen. Don't declare isfdtype unless __USE_MISC. * sysdeps/generic/listen.c: Fix type of second parameter of listen. * sysdeps/mach/hurd/listen.c: Likewise. * sysdeps/generic/bits/socket.h (struct sockaddr_storage): Define ss_family and __ss_family. * sysdeps/unix/sysv/aix/bits/socket.h: Likewise. * sysdeps/unix/sysv/linux/bits/socket.h: Likewise. (struct msghdr): Change type of msg_iovlen to int and type of msg_controllen to socklen_t. * sysdeps/unix/sysv/linux/alpha/bits/socket.h: New file. * sysdeps/unix/sysv/linux/ia64/bits/socket.h: New file. * sysdeps/unix/sysv/linux/sparc/sparc64/bits/socket.h: New file. --- sysdeps/unix/sysv/linux/bits/socket.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sysdeps/unix/sysv/linux/bits') diff --git a/sysdeps/unix/sysv/linux/bits/socket.h b/sysdeps/unix/sysv/linux/bits/socket.h index a7774424e9..3401220771 100644 --- a/sysdeps/unix/sysv/linux/bits/socket.h +++ b/sysdeps/unix/sysv/linux/bits/socket.h @@ -1,5 +1,5 @@ /* System-specific socket constants and types. Linux version. - Copyright (C) 1991, 1992, 1994-1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1991,1992,1994-1999,2000,2001 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -157,7 +157,7 @@ struct sockaddr struct sockaddr_storage { - __SOCKADDR_COMMON (__ss_); /* Address family, etc. */ + __SOCKADDR_COMMON (ss_); /* Address family, etc. */ __ss_aligntype __ss_align; /* Force desired alignment. */ char __ss_padding[_SS_PADSIZE]; }; @@ -212,10 +212,10 @@ struct msghdr socklen_t msg_namelen; /* Length of address data. */ struct iovec *msg_iov; /* Vector of data to send/receive into. */ - size_t msg_iovlen; /* Number of elements in the vector. */ + int msg_iovlen; /* Number of elements in the vector. */ void *msg_control; /* Ancillary data (eg BSD filedesc passing). */ - size_t msg_controllen; /* Ancillary data buffer length. */ + socklen_t msg_controllen; /* Ancillary data buffer length. */ int msg_flags; /* Flags on received message. */ }; -- cgit 1.4.1