diff options
| -rw-r--r-- | include/sys/select.h | 5 | ||||
| -rw-r--r-- | include/sys/socket.h | 9 | ||||
| -rw-r--r-- | misc/sys/select.h | 4 | ||||
| -rw-r--r-- | socket/sys/socket.h | 4 |
4 files changed, 14 insertions, 8 deletions
diff --git a/include/sys/select.h b/include/sys/select.h index dde8c60302..645929578c 100644 --- a/include/sys/select.h +++ b/include/sys/select.h @@ -6,4 +6,9 @@ extern int __pselect (int __nfds, __fd_set *__readfds, __fd_set *__writefds, __fd_set *__exceptfds, const struct timespec *__timeout, const __sigset_t *__sigmask); + +extern int __select (int __nfds, __fd_set *__restrict __readfds, + __fd_set *__restrict __writefds, + __fd_set *__restrict __exceptfds, + struct timeval *__restrict __timeout); #endif diff --git a/include/sys/socket.h b/include/sys/socket.h index 7d889ac928..1fc90b6014 100644 --- a/include/sys/socket.h +++ b/include/sys/socket.h @@ -19,4 +19,13 @@ extern int __opensock (void) internal_function; (which is *LEN bytes long), and its actual length into *LEN. */ extern int __getpeername (int __fd, __SOCKADDR_ARG __addr, socklen_t *__len); +/* Send N bytes of BUF to socket FD. Returns the number sent or -1. */ +extern int __send (int __fd, __const void *__buf, size_t __n, int __flags); + +/* Open a connection on socket FD to peer at ADDR (which LEN bytes long). + For connectionless socket types, just set the default address to send to + and the only address from which to accept transmissions. + Return 0 on success, -1 for errors. */ +extern int __connect (int __fd, __CONST_SOCKADDR_ARG __addr, socklen_t __len); + #endif diff --git a/misc/sys/select.h b/misc/sys/select.h index ff5ba6b39f..c182cb93c5 100644 --- a/misc/sys/select.h +++ b/misc/sys/select.h @@ -71,10 +71,6 @@ typedef __fd_set fd_set; (if not NULL) for exceptional conditions. If TIMEOUT is not NULL, time out after waiting the interval specified therein. Returns the number of ready descriptors, or -1 for errors. */ -extern int __select (int __nfds, __fd_set *__restrict __readfds, - __fd_set *__restrict __writefds, - __fd_set *__restrict __exceptfds, - struct timeval *__restrict __timeout) __THROW; extern int select (int __nfds, __fd_set *__restrict __readfds, __fd_set *__restrict __writefds, __fd_set *__restrict __exceptfds, diff --git a/socket/sys/socket.h b/socket/sys/socket.h index 1655d956e8..f049a79ac4 100644 --- a/socket/sys/socket.h +++ b/socket/sys/socket.h @@ -117,8 +117,6 @@ extern int getsockname (int __fd, __SOCKADDR_ARG __addr, For connectionless socket types, just set the default address to send to and the only address from which to accept transmissions. Return 0 on success, -1 for errors. */ -extern int __connect (int __fd, __CONST_SOCKADDR_ARG __addr, socklen_t __len) - __THROW; extern int connect (int __fd, __CONST_SOCKADDR_ARG __addr, socklen_t __len) __THROW; @@ -129,8 +127,6 @@ extern int getpeername (int __fd, __SOCKADDR_ARG __addr, /* Send N bytes of BUF to socket FD. Returns the number sent or -1. */ -extern int __send (int __fd, __const void *__buf, size_t __n, int __flags) - __THROW; extern int send (int __fd, __const void *__buf, size_t __n, int __flags) __THROW; |