diff options
author | Andreas Jaeger <aj@suse.de> | 2013-01-08 19:32:00 +0100 |
---|---|---|
committer | Andreas Jaeger <aj@suse.de> | 2013-01-08 19:32:00 +0100 |
commit | c40ea3d9a3be8645441967cddf14645b84af5f2c (patch) | |
tree | 1bd183b3d4de3a4780bbece8bdcaaa6464c7767b /ports | |
parent | 2ccdea26f290f6990606f4a43de5272afa1a784d (diff) | |
download | glibc-c40ea3d9a3be8645441967cddf14645b84af5f2c.tar.gz |
BZ#14985: Remove erroneous EPOLL_NONBLOCK
[BZ# 14985]
* sysdeps/unix/sysv/linux/sparc/bits/epoll.h (EPOLL_NONBLOCK):
Remove.
* sysdeps/unix/sysv/linux/bits/epoll.h (EPOLL_NONBLOCK):
Likewise.
* sysdeps/unix/sysv/linux/x86/bits/epoll.h (EPOLL_NONBLOCK):
Likewise.
ChangeLog.mips:
[BZ# 14985]
* sysdeps/unix/sysv/linux/mips/bits/epoll.h (EPOLL_NONBLOCK):
* Remove.
ChangeLog.hppa:
[BZ# 14985]
* sysdeps/unix/sysv/linux/hppa/sys/epoll.h (EPOLL_NONBLOCK):
Remove.
ChangeLog.alpha:
[BZ# 14985]
* sysdeps/unix/sysv/linux/alpha/bits/epoll.h (EPOLL_NONBLOCK):
Remove.
Diffstat (limited to 'ports')
-rw-r--r-- | ports/ChangeLog.alpha | 5 | ||||
-rw-r--r-- | ports/ChangeLog.hppa | 6 | ||||
-rw-r--r-- | ports/ChangeLog.mips | 5 | ||||
-rw-r--r-- | ports/sysdeps/unix/sysv/linux/alpha/bits/epoll.h | 4 | ||||
-rw-r--r-- | ports/sysdeps/unix/sysv/linux/hppa/sys/epoll.h | 4 | ||||
-rw-r--r-- | ports/sysdeps/unix/sysv/linux/mips/bits/epoll.h | 4 |
6 files changed, 19 insertions, 9 deletions
diff --git a/ports/ChangeLog.alpha b/ports/ChangeLog.alpha index fcefcf7172..2284ae3faa 100644 --- a/ports/ChangeLog.alpha +++ b/ports/ChangeLog.alpha @@ -1,3 +1,8 @@ +2013-01-08 Andreas Jaeger <aj@suse.de> + + [BZ# 14985] + * sysdeps/unix/sysv/linux/alpha/bits/epoll.h (EPOLL_NONBLOCK): Remove. + 2013-01-02 Joseph Myers <joseph@codesourcery.com> * sysdeps/alpha/Makefile: Fix copyright notice formatting. diff --git a/ports/ChangeLog.hppa b/ports/ChangeLog.hppa index 814f903f3d..2b798529b9 100644 --- a/ports/ChangeLog.hppa +++ b/ports/ChangeLog.hppa @@ -1,3 +1,9 @@ +2013-01-08 Andreas Jaeger <aj@suse.de> + + [BZ# 14985] + * sysdeps/unix/sysv/linux/hppa/sys/epoll.h (EPOLL_NONBLOCK): + Remove. + 2013-01-02 Joseph Myers <joseph@codesourcery.com> * All files with FSF copyright notices: Update copyright dates diff --git a/ports/ChangeLog.mips b/ports/ChangeLog.mips index 887527b25f..e3b2b069ac 100644 --- a/ports/ChangeLog.mips +++ b/ports/ChangeLog.mips @@ -1,3 +1,8 @@ +2013-01-08 Andreas Jaeger <aj@suse.de> + + [BZ# 14985] + * sysdeps/unix/sysv/linux/mips/bits/epoll.h (EPOLL_NONBLOCK): Remove. + 2013-01-02 Joseph Myers <joseph@codesourcery.com> * All files with FSF copyright notices: Update copyright dates diff --git a/ports/sysdeps/unix/sysv/linux/alpha/bits/epoll.h b/ports/sysdeps/unix/sysv/linux/alpha/bits/epoll.h index 72f57ef5a5..e983d506bb 100644 --- a/ports/sysdeps/unix/sysv/linux/alpha/bits/epoll.h +++ b/ports/sysdeps/unix/sysv/linux/alpha/bits/epoll.h @@ -22,8 +22,6 @@ /* Flags to be passed to epoll_create1. */ enum { - EPOLL_CLOEXEC = 010000000, + EPOLL_CLOEXEC = 010000000 #define EPOLL_CLOEXEC EPOLL_CLOEXEC - EPOLL_NONBLOCK = 000000004 -#define EPOLL_NONBLOCK EPOLL_NONBLOCK }; diff --git a/ports/sysdeps/unix/sysv/linux/hppa/sys/epoll.h b/ports/sysdeps/unix/sysv/linux/hppa/sys/epoll.h index 9f0db111d8..d9a0b1f4e7 100644 --- a/ports/sysdeps/unix/sysv/linux/hppa/sys/epoll.h +++ b/ports/sysdeps/unix/sysv/linux/hppa/sys/epoll.h @@ -33,10 +33,8 @@ typedef __sigset_t sigset_t; /* Flags to be passed to epoll_create1. */ enum { - EPOLL_CLOEXEC = 010000000, + EPOLL_CLOEXEC = 010000000 #define EPOLL_CLOEXEC EPOLL_CLOEXEC - EPOLL_NONBLOCK = 00200004 /* HPUX has separate NDELAY & NONBLOCK */ -#define EPOLL_NONBLOCK EPOLL_NONBLOCK }; diff --git a/ports/sysdeps/unix/sysv/linux/mips/bits/epoll.h b/ports/sysdeps/unix/sysv/linux/mips/bits/epoll.h index 3276fd0bb3..d8b82053e0 100644 --- a/ports/sysdeps/unix/sysv/linux/mips/bits/epoll.h +++ b/ports/sysdeps/unix/sysv/linux/mips/bits/epoll.h @@ -22,8 +22,6 @@ /* Flags to be passed to epoll_create1. */ enum { - EPOLL_CLOEXEC = 02000000, + EPOLL_CLOEXEC = 02000000 #define EPOLL_CLOEXEC EPOLL_CLOEXEC - EPOLL_NONBLOCK = 00000200 -#define EPOLL_NONBLOCK EPOLL_NONBLOCK }; |