diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2010-09-01 12:45:02 -0700 |
|---|---|---|
| committer | Petr Baudis <pasky@suse.cz> | 2010-11-15 18:11:53 +0100 |
| commit | 457c305d8a919e4fc886c56bd153442e915a7c7e (patch) | |
| tree | 3951420a5752dd84609ae18547f6c4857501a52b | |
| parent | 5a647459c82250dfd382b3bda7ec909c0e581b23 (diff) | |
| download | glibc-457c305d8a919e4fc886c56bd153442e915a7c7e.tar.gz glibc-457c305d8a919e4fc886c56bd153442e915a7c7e.tar.xz glibc-457c305d8a919e4fc886c56bd153442e915a7c7e.zip | |
Update sparc epoll.h from epoll_create2 to epoll_create1
(cherry picked from commit fdc0c10d9b5c39ec20c35d2f3808d3c70cb7f60b)
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sparc/sys/epoll.h | 9 |
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index d970cf6b4a..1570ce7528 100644 --- a/ChangeLog +++ b/ChangeLog @@ -97,6 +97,9 @@ 2010-08-31 Mike Frysinger <vapier@gentoo.org> + * sysdeps/unix/sysv/linux/sparc/sys/epoll.h (epoll_create2): Delete. + (epoll_create1): Declare. + * sysdeps/unix/sysv/linux/x86_64/sys/epoll.h: Fix typo. 2010-08-31 Andreas Schwab <schwab@redhat.com> diff --git a/sysdeps/unix/sysv/linux/sparc/sys/epoll.h b/sysdeps/unix/sysv/linux/sparc/sys/epoll.h index cc0ddef69e..9943f21383 100644 --- a/sysdeps/unix/sysv/linux/sparc/sys/epoll.h +++ b/sysdeps/unix/sysv/linux/sparc/sys/epoll.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2002-2006, 2007, 2008 Free Software Foundation, Inc. +/* Copyright (C) 2002-2006, 2007, 2008, 2010 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 @@ -31,7 +31,7 @@ typedef __sigset_t sigset_t; #endif -/* Flags to be passed to epoll_create2. */ +/* Flags to be passed to epoll_create1. */ enum { EPOLL_CLOEXEC = 0x400000, @@ -101,8 +101,9 @@ __BEGIN_DECLS returned by epoll_create() should be closed with close(). */ extern int epoll_create (int __size) __THROW; -/* Same as epoll_create but with an additional FLAGS parameter. */ -extern int epoll_create2 (int __size, int __flags) __THROW; +/* Same as epoll_create but with an FLAGS parameter. The unused SIZE + parameter has been dropped. */ +extern int epoll_create1 (int __flags) __THROW; /* Manipulate an epoll instance "epfd". Returns 0 in case of success, |