diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2007-09-12 16:26:54 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2007-09-12 16:26:54 +0000 |
| commit | 83584a7af898dd93c48600fe850d150c51b10899 (patch) | |
| tree | 0affa8ffee374ab83e40501d8d8967a03569c44d /libc/sysdeps/unix/sysv/linux/pselect.c | |
| parent | 04b4d23592609edcd19fd5a461bbe6d3cc677b5b (diff) | |
Merge changes between r2424 and r3467 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@3468 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/sysdeps/unix/sysv/linux/pselect.c')
| -rw-r--r-- | libc/sysdeps/unix/sysv/linux/pselect.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libc/sysdeps/unix/sysv/linux/pselect.c b/libc/sysdeps/unix/sysv/linux/pselect.c index 0dd744f52..f39ee920c 100644 --- a/libc/sysdeps/unix/sysv/linux/pselect.c +++ b/libc/sysdeps/unix/sysv/linux/pselect.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2006 Free Software Foundation, Inc. +/* Copyright (C) 2006, 2007 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2006. @@ -26,10 +26,12 @@ #ifdef __NR_pselect6 +# ifndef __ASSUME_PSELECT static int __generic_pselect (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, const struct timespec *timeout, const sigset_t *sigmask); +# endif int |