diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-08-20 19:50:45 +0200 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-08-20 19:50:45 +0200 |
commit | 4dd9e35bfd35d3138bc44169baba098005bad51e (patch) | |
tree | a4939c43a9c3fe00eb27f023e14acc5e1fe8808c /sysdeps/unix/sysv/linux/pselect.c | |
parent | bd42a4599d1b6f77bcfe1e4f67b7cbd9e1cb2dfd (diff) | |
parent | f76453c31593957fec1a99b986bfa5506618b79c (diff) |
Merge commit 'refs/top-bases/t/bigmem' into t/bigmem
Diffstat (limited to 'sysdeps/unix/sysv/linux/pselect.c')
-rw-r--r-- | sysdeps/unix/sysv/linux/pselect.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/sysdeps/unix/sysv/linux/pselect.c b/sysdeps/unix/sysv/linux/pselect.c index b4e77c16aa..30d51d7902 100644 --- a/sysdeps/unix/sysv/linux/pselect.c +++ b/sysdeps/unix/sysv/linux/pselect.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2006-2014 Free Software Foundation, Inc. +/* Copyright (C) 2006-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2006. @@ -63,22 +63,11 @@ __pselect (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, #ifndef CALL_PSELECT6 # define CALL_PSELECT6(nfds, readfds, writefds, exceptfds, timeout, data) \ - INLINE_SYSCALL (pselect6, 6, nfds, readfds, writefds, exceptfds, \ - timeout, data) + SYSCALL_CANCEL (pselect6, nfds, readfds, writefds, exceptfds, timeout, data) #endif - if (SINGLE_THREAD_P) - result = CALL_PSELECT6 (nfds, readfds, writefds, exceptfds, timeout, - &data); - else - { - int oldtype = LIBC_CANCEL_ASYNC (); - - result = CALL_PSELECT6 (nfds, readfds, writefds, exceptfds, timeout, - &data); - - LIBC_CANCEL_RESET (oldtype); - } + result = CALL_PSELECT6 (nfds, readfds, writefds, exceptfds, timeout, + &data); # ifndef __ASSUME_PSELECT if (result == -1 && errno == ENOSYS) @@ -89,7 +78,6 @@ __pselect (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, return result; } weak_alias (__pselect, pselect) -strong_alias (__pselect, __libc_pselect) # ifndef __ASSUME_PSELECT # define __pselect static __generic_pselect |