aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2006-02-22 05:49:01 +0000
committerRoland McGrath <roland@gnu.org>2006-02-22 05:49:01 +0000
commitedb72ee4e5cb2c1067102edabe4137d3f960e521 (patch)
tree81632ded5e6665a4e7df96d63e5abb47ed7c0dd2
parentb6bb5f6a819689fc49a216bc471d1b170c06c3e5 (diff)
downloadglibc-edb72ee4e5cb2c1067102edabe4137d3f960e521.zip
glibc-edb72ee4e5cb2c1067102edabe4137d3f960e521.tar.gz
glibc-edb72ee4e5cb2c1067102edabe4137d3f960e521.tar.bz2
* sysdeps/unix/sysv/linux/x86_64/sys/epoll.h: Update comment, remove
__THROW from epoll_wait, to match .../linux/sys/epoll.h file.
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/sys/epoll.h9
2 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index adb31fd..bf5d464 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-21 Roland McGrath <roland@redhat.com>
+
+ * sysdeps/unix/sysv/linux/x86_64/sys/epoll.h: Update comment, remove
+ __THROW from epoll_wait, to match .../linux/sys/epoll.h file.
+
2005-11-15 Robert Millan <robertmh@gnu.org>
[BZ #2161]
diff --git a/sysdeps/unix/sysv/linux/x86_64/sys/epoll.h b/sysdeps/unix/sysv/linux/x86_64/sys/epoll.h
index cffddb5..02672d3 100644
--- a/sysdeps/unix/sysv/linux/x86_64/sys/epoll.h
+++ b/sysdeps/unix/sysv/linux/x86_64/sys/epoll.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 2002,2003,2004,2005,2006 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