diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-07-05 23:58:08 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-07-06 00:44:20 -0700 |
| commit | c1dcfef8c8e60b139732f79bd8a9787e5d6a805f (patch) | |
| tree | b9a9de085588af09c0b3004ba20e189a34e00c1a | |
| parent | 8750d25d450a75684c2f29e2eea2467cea18f076 (diff) | |
| download | gnulib-c1dcfef8c8e60b139732f79bd8a9787e5d6a805f.tar.gz | |
* 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.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/pselect.c | 10 | ||||
| -rw-r--r-- | modules/pselect | 2 |
3 files changed, 10 insertions, 7 deletions
@@ -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. diff --git a/lib/pselect.c b/lib/pselect.c index 7eec89c851..6b9ba22ad3 100644 --- a/lib/pselect.c +++ b/lib/pselect.c @@ -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; diff --git a/modules/pselect b/modules/pselect index b899198704..5f6291b3d2 100644 --- a/modules/pselect +++ b/modules/pselect @@ -10,7 +10,7 @@ sys_select 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]) |