summary refs log tree commit diff
path: root/conform
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-01-27 21:26:25 +0000
committerUlrich Drepper <drepper@redhat.com>2001-01-27 21:26:25 +0000
commit6f0ea379033c4541b3e93e87579b9a184ded58ac (patch)
treeed0994a1ee94ff97c4c391845658fa9b5844c9d8 /conform
parent257abbe2e31a500ee871075e3c8c486c4289c375 (diff)
downloadglibc-6f0ea379033c4541b3e93e87579b9a184ded58ac.tar.gz
glibc-6f0ea379033c4541b3e93e87579b9a184ded58ac.tar.xz
glibc-6f0ea379033c4541b3e93e87579b9a184ded58ac.zip
Update.
	* conform/data/sys/socket.h-data: Fix typos.  Correct getsockopt,
	recvfrom, send, and socketpair prototypes.  Add allow lines.
	* socket/sys/socket.h: Include <sys/uio.h>.
	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.
Diffstat (limited to 'conform')
-rw-r--r--conform/data/sys/socket.h-data25
1 files changed, 18 insertions, 7 deletions
diff --git a/conform/data/sys/socket.h-data b/conform/data/sys/socket.h-data
index 13eed1ece4..7aee89f8b7 100644
--- a/conform/data/sys/socket.h-data
+++ b/conform/data/sys/socket.h-data
@@ -6,7 +6,7 @@ type sa_family_t
 type {struct sockaddr}
 
 element {struct sockaddr} sa_family_t sa_family
-element {struct sockaddr} char sa_data [0]
+element {struct sockaddr} char sa_data []
 
 type {struct sockaddr_storage}
 
@@ -64,7 +64,7 @@ macro SO_RCVTIMEO
 macro SO_REUSEADDR
 macro SO_SNDBUF
 macro SO_SNDLOWAT
-macro SO_SNFTIMEO
+macro SO_SNDTIMEO
 macro SO_TYPE
 
 macro SOMAXCONN
@@ -80,7 +80,7 @@ macro MSG_WAITALL
 macro AF_UNIX
 macro AF_UNSPEC
 macro AF_INET
-macro_AF_INET6
+macro AF_INET6
 
 macro SHUT_RD
 macro SHUT_WR
@@ -91,18 +91,29 @@ function int bind (int, const struct sockaddr*, socklen_t)
 function int connect (int, const struct sockaddr*, socklen_t)
 function int getpeername (int, struct sockaddr*, socklen_t*)
 function int getsockname (int, struct sockaddr*, socklen_t*)
-function int getsockopt (int, int, int, void*, socklen_t)
+function int getsockopt (int, int, int, void*, socklen_t*)
 function int listen (int, int)
 function ssize_t recv (int, void*, size_t, int)
-function ssize_t recvfrom (int, void*, size_t, int)
+function ssize_t recvfrom (int, void*, size_t, int, struct sockaddr*, socklen_t*)
 function ssize_t recvmsg (int, struct msghdr*, int)
-function ssize_t send (int, const struct msghdr*, int)
+function ssize_t send (int, const void*, size_t, int)
 function ssize_t sendmsg (int, const struct msghdr*, int)
 function ssize_t sendto (int, const void*, size_t, int, const struct sockaddr*, socklen_t)
 function int setsockopt (int, int, int, const void*, socklen_t)
 function int shutdown (int, int)
 function int socket (int, int, int)
-function int socketpair (int, int, int, int)
+function int socketpair (int, int, int, int[2])
 
 allow-header sys/uio.h
+
+allow ss_*
+allow sa_*
+allow if_*
+allow ifc_*
+allow ifru_*
+allow infu_*
+allow ifra_*
+allow msg_*
+allow cmsg_*
+allow l_*
 #endif