Mercurial > gnulib
changeset 15345:dfb7afc490db
* lib/pselect.c (pselect): Use plain name, without "rpl_".
Don't #undef, since we don't need any underlying pselect.
* modules/pselect (Depends-on): Use our pselect.o if !HAVE_PSELECT.
Both changes suggested by Bruno Haible.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Tue, 05 Jul 2011 23:58:08 -0700 |
| parents | bb72ef288fbe |
| children | ea3fbffa09cb |
| files | ChangeLog lib/pselect.c modules/pselect |
| diffstat | 3 files changed, 10 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Jul 05 23:48:19 2011 -0700 +++ b/ChangeLog Tue Jul 05 23:58:08 2011 -0700 @@ -1,5 +1,10 @@ 2011-07-05 Paul Eggert <eggert@cs.ucla.edu> + * lib/pselect.c (pselect): Use plain name, without "rpl_". + Don't #undef, since we don't need any underlying pselect. + * modules/pselect (Depends-on): Use our pselect.o if !HAVE_PSELECT. + Both changes suggested by Bruno Haible. + pselect: document better * MODULES.html.sh (Support for systems lacking POSIX:2008): Add it. * doc/posix-functions/pselect.texi (pselect): Document new module.
--- a/lib/pselect.c Tue Jul 05 23:48:19 2011 -0700 +++ b/lib/pselect.c Tue Jul 05 23:58:08 2011 -0700 @@ -27,8 +27,6 @@ #include <errno.h> #include <signal.h> -#undef pselect - /* Examine the size-NFDS file descriptor sets in RFDS, WFDS, and XFDS to see whether some of their descriptors are ready for reading, ready for writing, or have exceptions pending. Wait for at most @@ -37,10 +35,10 @@ or an unaffected signal mask. */ int -rpl_pselect (int nfds, fd_set *restrict rfds, - fd_set *restrict wfds, fd_set *restrict xfds, - struct timespec const *restrict timeout, - sigset_t const *restrict sigmask) +pselect (int nfds, fd_set *restrict rfds, + fd_set *restrict wfds, fd_set *restrict xfds, + struct timespec const *restrict timeout, + sigset_t const *restrict sigmask) { int select_result; sigset_t origmask;
--- a/modules/pselect Tue Jul 05 23:48:19 2011 -0700 +++ b/modules/pselect Tue Jul 05 23:58:08 2011 -0700 @@ -10,7 +10,7 @@ configure.ac: gl_FUNC_PSELECT -if test $REPLACE_PSELECT = 1; then +if test $HAVE_PSELECT = 0 || test $REPLACE_PSELECT = 1; then AC_LIBOBJ([pselect]) fi gl_SYS_SELECT_MODULE_INDICATOR([pselect])