diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2001-01-27 21:26:25 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2001-01-27 21:26:25 +0000 |
| commit | 6f0ea379033c4541b3e93e87579b9a184ded58ac (patch) | |
| tree | ed0994a1ee94ff97c4c391845658fa9b5844c9d8 /socket | |
| parent | 257abbe2e31a500ee871075e3c8c486c4289c375 (diff) | |
| download | glibc-6f0ea379033c4541b3e93e87579b9a184ded58ac.tar glibc-6f0ea379033c4541b3e93e87579b9a184ded58ac.tar.gz glibc-6f0ea379033c4541b3e93e87579b9a184ded58ac.tar.bz2 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 'socket')
| -rw-r--r-- | socket/sys/socket.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/socket/sys/socket.h b/socket/sys/socket.h index f049a79ac4..83f7de7331 100644 --- a/socket/sys/socket.h +++ b/socket/sys/socket.h @@ -1,5 +1,5 @@ /* Declarations of socket constants, types, and functions. - Copyright (C) 1991,92,94,95,96,97,98,99,2000 Free Software Foundation, Inc. + Copyright (C) 1991,92,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 @@ -24,6 +24,7 @@ __BEGIN_DECLS +#include <sys/uio.h> #define __need_size_t #include <stddef.h> @@ -61,7 +62,7 @@ enum uses with any of the listed types to be allowed without complaint. G++ 2.7 does not support transparent unions so there we want the old-style declaration, too. */ -#if defined __cplusplus || !__GNUC_PREREQ (2, 7) +#if defined __cplusplus || !__GNUC_PREREQ (2, 7) || !defined __USE_GNU # define __SOCKADDR_ARG struct sockaddr *__restrict # define __CONST_SOCKADDR_ARG __const struct sockaddr * #else @@ -178,7 +179,7 @@ extern int setsockopt (int __fd, int __level, int __optname, /* Prepare to accept connections on socket FD. N connection requests will be queued before further requests are refused. Returns 0 on success, -1 for errors. */ -extern int listen (int __fd, unsigned int __n) __THROW; +extern int listen (int __fd, int __n) __THROW; /* Await a connection on socket FD. When a connection arrives, open a new socket to communicate with it, @@ -198,10 +199,12 @@ extern int accept (int __fd, __SOCKADDR_ARG __addr, extern int shutdown (int __fd, int __how) __THROW; +#ifdef __USE_MISC /* FDTYPE is S_IFSOCK or another S_IF* macro defined in <sys/stat.h>; returns 1 if FD is open on an object of the indicated type, 0 if not, or -1 for errors (setting errno). */ extern int isfdtype (int __fd, int __fdtype) __THROW; +#endif __END_DECLS |