From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 6 Jul 2011 06:58:08 +0000 (-0700)
Subject: * lib/pselect.c (pselect): Use plain name, without "rpl_".
X-Git-Tag: v0.1~2181
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=c1dcfef8c8e60b139732f79bd8a9787e5d6a805f;p=gnulib.git

* 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 35b2fa84e..e815b2930 100644
--- 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 7eec89c85..6b9ba22ad 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 b89919870..5f6291b3d 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])