about summary refs log tree commit diff
path: root/io/sys
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2005-11-16 08:40:33 +0000
committerJakub Jelinek <jakub@redhat.com>2005-11-16 08:40:33 +0000
commitb9616a4d2d0ff113b95a638127ad27c98e6c713b (patch)
tree44a217d883df77585469066a882b4eb96a1aef19 /io/sys
parent7af1fc8277a5c9f20739e9c0b55ae727c3771e1a (diff)
downloadglibc-b9616a4d2d0ff113b95a638127ad27c98e6c713b.tar.gz
glibc-b9616a4d2d0ff113b95a638127ad27c98e6c713b.tar.xz
glibc-b9616a4d2d0ff113b95a638127ad27c98e6c713b.zip
Updated to fedora-glibc-20051116T0829 cvs/fedora-glibc-2_3_90-17
Diffstat (limited to 'io/sys')
-rw-r--r--io/sys/poll.h7
-rw-r--r--io/sys/stat.h2
2 files changed, 6 insertions, 3 deletions
diff --git a/io/sys/poll.h b/io/sys/poll.h
index 89a27eab2b..9cf1b9f1c0 100644
--- a/io/sys/poll.h
+++ b/io/sys/poll.h
@@ -1,5 +1,5 @@
 /* Compatibility definitions for System V `poll' interface.
-   Copyright (C) 1994,96,97,98,99,2000,2001,2004 Free Software Foundation, Inc.
+   Copyright (C) 1994,1996-2001,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
@@ -44,7 +44,10 @@ __BEGIN_DECLS
    FDS.  If TIMEOUT is nonzero and not -1, allow TIMEOUT milliseconds for
    an event to occur; if TIMEOUT is -1, block until an event occurs.
    Returns the number of file descriptors with events, zero if timed out,
-   or -1 for errors.  */
+   or -1 for errors.
+
+   This function is a cancellation point and therefore not marked with
+   __THROW.  */
 extern int poll (struct pollfd *__fds, nfds_t __nfds, int __timeout);
 
 __END_DECLS
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,