summaryrefslogtreecommitdiff
path: root/include/sys
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-02-22 03:32:04 +0000
committerMike Frysinger <vapier@gentoo.org>2006-02-22 03:32:04 +0000
commitf2cb3292552ae4c103f393727e1ff3620996d903 (patch)
tree70fc2061e585b0365f8ec76634a195992325e188 /include/sys
parent869fedf9ad9917385f0b896b4d92f54742b84172 (diff)
sync with glibc
Diffstat (limited to 'include/sys')
-rw-r--r--include/sys/epoll.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/include/sys/epoll.h b/include/sys/epoll.h
index 6c310bcff..68f173a04 100644
--- a/include/sys/epoll.h
+++ b/include/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