summary refs log tree commit diff
path: root/sysdeps
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2005-11-15 21:58:44 +0000
committerUlrich Drepper <drepper@redhat.com>2005-11-15 21:58:44 +0000
commit7761a3ac532d50d500bafc073e02ce17b52be377 (patch)
tree2e6e5b3da897b5afd4da51d51ac16b6b62ecc577 /sysdeps
parent1b804a349f2f210df5e9aab35380df513191e334 (diff)
downloadglibc-7761a3ac532d50d500bafc073e02ce17b52be377.tar.gz
glibc-7761a3ac532d50d500bafc073e02ce17b52be377.tar.xz
glibc-7761a3ac532d50d500bafc073e02ce17b52be377.zip
* io/sys/poll.h: Add comment explaining poll is a cancellation
point.

	* sysdeps/unix/sysv/linux/sys/epoll.h: Add comment explaining
	epoll_wait is a cancellation point.
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/unix/sysv/linux/sys/epoll.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/sysdeps/unix/sysv/linux/sys/epoll.h b/sysdeps/unix/sysv/linux/sys/epoll.h
index 6c310bcff5..68f173a04d 100644
--- a/sysdeps/unix/sysv/linux/sys/epoll.h
+++ b/sysdeps/unix/sysv/linux/sys/epoll.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -98,9 +98,12 @@ extern int epoll_ctl (int __epfd, int __op, int __fd,
    "events" parameter is a buffer that will contain triggered
    events. The "maxevents" is the maximum number of events to be
    returned ( usually size of "events" ). The "timeout" parameter
-   specifies the maximum wait time in milliseconds (-1 == infinite).  */
+   specifies the maximum wait time in milliseconds (-1 == infinite).
+
+   This function is a cancellation point and therefore not marked with
+   __THROW.  */
 extern int epoll_wait (int __epfd, struct epoll_event *__events,
-		       int __maxevents, int __timeout) __THROW;
+		       int __maxevents, int __timeout);
 
 __END_DECLS