aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-01-19 15:52:01 +0000
committerUlrich Drepper <drepper@redhat.com>2006-01-19 15:52:01 +0000
commit93c04024a6b900b69bbe9a70de06ac23b8273787 (patch)
treed40b615402c328bccfbd71e604702d0c705a2d00
parent814ef022c66e7c2ecfd280171ad47304f5ec2da7 (diff)
downloadglibc-93c04024a6b900b69bbe9a70de06ac23b8273787.tar
glibc-93c04024a6b900b69bbe9a70de06ac23b8273787.tar.gz
glibc-93c04024a6b900b69bbe9a70de06ac23b8273787.tar.bz2
glibc-93c04024a6b900b69bbe9a70de06ac23b8273787.zip
Include sysdep-cancel.h again. Add LIBC_CANCEL_HANDLED ().
-rw-r--r--ChangeLog1
-rw-r--r--misc/pselect.c3
2 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 8eb7551da5..55b67b4703 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
2006-01-19 Jakub Jelinek <jakub@redhat.com>
* misc/pselect.c (__pselect): Remove static.
+ Include sysdep-cancel.h again. Add LIBC_CANCEL_HANDLED ().
2006-01-18 Roland McGrath <roland@redhat.com>
diff --git a/misc/pselect.c b/misc/pselect.c
index 42d1c48f13..1d841a8cf4 100644
--- a/misc/pselect.c
+++ b/misc/pselect.c
@@ -22,6 +22,7 @@
#include <stddef.h> /* For NULL. */
#include <sys/time.h>
#include <sys/select.h>
+#include <sysdep-cancel.h>
/* Check the first NFDS descriptors each in READFDS (if not NULL) for read
@@ -63,3 +64,5 @@ __pselect (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
}
weak_alias (__pselect, pselect)
strong_alias (__pselect, __libc_pselect)
+/* __select handles cancellation. */
+LIBC_CANCEL_HANDLED ();