From 8ec2550e18dcc37958ec17eb2de3ab34ab879d1e Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 29 Sep 2008 17:08:50 +0000 Subject: [PATCH] * socket/Versions: Remove paccept export for GLIBC_2.9. * socket/Makefile (routines): Remove paccept. * socket/sys/socket.h: Remove paccept declaration. --- ChangeLog | 4 ++++ NEWS | 4 ++-- socket/Makefile | 2 +- socket/Versions | 3 --- socket/sys/socket.h | 12 ------------ 5 files changed, 7 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6c4b9ee176..1a56e37751 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2008-09-29 Ulrich Drepper + * socket/Versions: Remove paccept export for GLIBC_2.9. + * socket/Makefile (routines): Remove paccept. + * socket/sys/socket.h: Remove paccept declaration. + * po/sv.po: Update from translation team. 2008-09-22 Deborah S. Townsend diff --git a/NEWS b/NEWS index b8cc4a2c96..b17f053c00 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -GNU C Library NEWS -- history of user-visible changes. 2008-9-16 +GNU C Library NEWS -- history of user-visible changes. 2008-9-29 Copyright (C) 1992-2007, 2008 Free Software Foundation, Inc. See the end for copying conditions. @@ -23,7 +23,7 @@ Version 2.9 * New implementation of memmem, strstr, and strcasestr which is O(n). Implemented by Eric Blake. -* New Linux interfaces: inotify_init1, paccept, dup3, epoll_create1, pipe2 +* New Linux interfaces: inotify_init1, dup3, epoll_create1, pipe2 * Implement "e" option for popen to open file descriptor with the close-on-exec flag set. Implemented by Ulrich Drepper. diff --git a/socket/Makefile b/socket/Makefile index e7fa589e65..92a87079e3 100644 --- a/socket/Makefile +++ b/socket/Makefile @@ -27,7 +27,7 @@ headers := sys/socket.h sys/un.h bits/sockaddr.h bits/socket.h \ routines := accept bind connect getpeername getsockname getsockopt \ listen recv recvfrom recvmsg send sendmsg sendto \ setsockopt shutdown socket socketpair isfdtype opensock \ - sockatmark paccept + sockatmark aux := have_sock_cloexec diff --git a/socket/Versions b/socket/Versions index 9764227c36..d282eff79e 100644 --- a/socket/Versions +++ b/socket/Versions @@ -31,7 +31,4 @@ libc { # Addition from P1003.1-200x sockatmark; } - GLIBC_2.9 { - paccept; - } } diff --git a/socket/sys/socket.h b/socket/sys/socket.h index ea4123d287..e0a6a5216a 100644 --- a/socket/sys/socket.h +++ b/socket/sys/socket.h @@ -214,18 +214,6 @@ extern int listen (int __fd, int __n) __THROW; extern int accept (int __fd, __SOCKADDR_ARG __addr, socklen_t *__restrict __addr_len); -#ifdef __USE_GNU -/* Variant of the accept function which takes additional parameters. The - MASK parameter allows to change the thread signal mask for the duration - of the call. The FLAGS parameter allows to pass additional flags. - - This function is a cancellation point and therefore not marked with - __THROW. */ -extern int paccept (int __fd, __SOCKADDR_ARG __addr, - socklen_t *__restrict __addr_len, - __const __sigset_t *__restrict __ss, int __flags); -#endif - /* Shut down all or part of the connection open on socket FD. HOW determines what to shut down: SHUT_RD = No more receptions;