aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2005-11-15 19:59:57 +0000
committerUlrich Drepper <drepper@redhat.com>2005-11-15 19:59:57 +0000
commit933c64a356e129481238b6e2bf4b75e4e23a0b90 (patch)
tree6817c4c0e03bfa70bfa3a86e419d4c8a95099d12
parentfcae3b76f63626b0e587f8e3b40191136e36041b (diff)
downloadglibc-933c64a356e129481238b6e2bf4b75e4e23a0b90.tar
glibc-933c64a356e129481238b6e2bf4b75e4e23a0b90.tar.gz
glibc-933c64a356e129481238b6e2bf4b75e4e23a0b90.tar.bz2
glibc-933c64a356e129481238b6e2bf4b75e4e23a0b90.zip
* sysdeps/unix/sysv/linux/syscalls.list (epoll_create, epoll_ctl,
epoll_wait): Align with poll, make cancelable. 2005-11-15 Jakub Jelinek <jakub@redhat.com> * io/sys/stat.h (fstatat): Don't use __THROW together with __REDIRECT_NTH.
-rw-r--r--ChangeLog10
-rw-r--r--io/sys/stat.h2
-rw-r--r--sysdeps/unix/sysv/linux/syscalls.list6
3 files changed, 14 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 83f8d80097..f4d57e90b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-11-15 Ulrich Drepper <drepper@redhat.com>
+
+ * sysdeps/unix/sysv/linux/syscalls.list (epoll_create, epoll_ctl,
+ epoll_wait): Align with poll, make cancelable.
+
+2005-11-15 Jakub Jelinek <jakub@redhat.com>
+
+ * io/sys/stat.h (fstatat): Don't use __THROW together with
+ __REDIRECT_NTH.
+
2005-11-14 Ulrich Drepper <drepper@redhat.com>
* elf/dl-open.c [!SHARED]: Remove _dl_tls_static_size definition.
diff --git a/io/sys/stat.h b/io/sys/stat.h
index 0a82ef39e8..87eca61275 100644
--- a/io/sys/stat.h
+++ b/io/sys/stat.h
@@ -238,7 +238,7 @@ extern int fstatat (int __fd, const char *__file, struct stat *__buf,
# else
extern int __REDIRECT_NTH (fstatat, (int __fd, const char *__file,
struct stat *__buf, int __flag),
- fstatat64) __THROW __nonnull ((2, 3));
+ fstatat64) __nonnull ((2, 3));
# endif
extern int fstatat64 (int __fd, const char *__file, struct stat64 *__buf,
diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list
index d5c3e650bc..bcd9d97d76 100644
--- a/sysdeps/unix/sysv/linux/syscalls.list
+++ b/sysdeps/unix/sysv/linux/syscalls.list
@@ -8,9 +8,9 @@ capset EXTRA capset i:pp capset
creat - creat Ci:si __libc_creat creat
create_module EXTRA create_module 3 create_module
delete_module EXTRA delete_module 3 delete_module
-epoll_create EXTRA epoll_create i:i epoll_create
-epoll_ctl EXTRA epoll_ctl i:iiip epoll_ctl
-epoll_wait EXTRA epoll_wait i:ipii epoll_wait
+epoll_create EXTRA epoll_create Ci:i epoll_create
+epoll_ctl EXTRA epoll_ctl Ci:iiip epoll_ctl
+epoll_wait EXTRA epoll_wait Ci:ipii epoll_wait
fdatasync - fdatasync i:i fdatasync
flock - flock i:ii __flock flock
fork - fork i: __libc_fork __fork fork