* 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.

diff --git a/ChangeLog b/ChangeLog
index 35b2fa84e64e266b7ca4150151d4916e0fbd2355..e815b29301ca7ef120b382d0a59a57d472bc9c5a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 7eec89c8514055a8295cafe84549fb3c01ddac92..6b9ba22ad37b95e435b633e17bca047edb6b9575 100644 (file)
--- 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 b899198704611194b709202e090e18368b16bff5..5f6291b3d2cdbe4774627e703a5db61fba100a6f 100644 (file)
--- 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])