From c40ea3d9a3be8645441967cddf14645b84af5f2c Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Tue, 8 Jan 2013 19:32:00 +0100 Subject: 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. --- ChangeLog | 8 ++++++++ NEWS | 2 +- ports/ChangeLog.alpha | 5 +++++ ports/ChangeLog.hppa | 6 ++++++ ports/ChangeLog.mips | 5 +++++ ports/sysdeps/unix/sysv/linux/alpha/bits/epoll.h | 4 +--- ports/sysdeps/unix/sysv/linux/hppa/sys/epoll.h | 4 +--- ports/sysdeps/unix/sysv/linux/mips/bits/epoll.h | 4 +--- sysdeps/unix/sysv/linux/bits/epoll.h | 4 +--- sysdeps/unix/sysv/linux/sparc/bits/epoll.h | 4 +--- sysdeps/unix/sysv/linux/x86/bits/epoll.h | 4 +--- 11 files changed, 31 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index b0e45aea5b..5390435014 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2013-01-08 Andreas Jaeger + + [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. + 2013-01-07 Anton Blanchard * sysdeps/powerpc/fpu/feholdexcpt.c: Fixed spelling errors. diff --git a/NEWS b/NEWS index 8a0da94c12..d0e02c6b1c 100644 --- a/NEWS +++ b/NEWS @@ -9,7 +9,7 @@ Version 2.18 * The following bugs are resolved with this release: - 13951, 14317, 14981, 14982, 14994, 14996. + 13951, 14317, 14981, 14982, 14985, 14994, 14996. Version 2.17 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 + + [BZ# 14985] + * sysdeps/unix/sysv/linux/alpha/bits/epoll.h (EPOLL_NONBLOCK): Remove. + 2013-01-02 Joseph Myers * 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 + + [BZ# 14985] + * sysdeps/unix/sysv/linux/hppa/sys/epoll.h (EPOLL_NONBLOCK): + Remove. + 2013-01-02 Joseph Myers * 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 + + [BZ# 14985] + * sysdeps/unix/sysv/linux/mips/bits/epoll.h (EPOLL_NONBLOCK): Remove. + 2013-01-02 Joseph Myers * 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 }; diff --git a/sysdeps/unix/sysv/linux/bits/epoll.h b/sysdeps/unix/sysv/linux/bits/epoll.h index 21b40d3cdc..d8b82053e0 100644 --- a/sysdeps/unix/sysv/linux/bits/epoll.h +++ b/sysdeps/unix/sysv/linux/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 = 00004000 -#define EPOLL_NONBLOCK EPOLL_NONBLOCK }; diff --git a/sysdeps/unix/sysv/linux/sparc/bits/epoll.h b/sysdeps/unix/sysv/linux/sparc/bits/epoll.h index 8c9968e353..d984723653 100644 --- a/sysdeps/unix/sysv/linux/sparc/bits/epoll.h +++ b/sysdeps/unix/sysv/linux/sparc/bits/epoll.h @@ -22,8 +22,6 @@ /* Flags to be passed to epoll_create1. */ enum { - EPOLL_CLOEXEC = 0x400000, + EPOLL_CLOEXEC = 0x400000 #define EPOLL_CLOEXEC EPOLL_CLOEXEC - EPOLL_NONBLOCK = 0x004000 -#define EPOLL_NONBLOCK EPOLL_NONBLOCK }; diff --git a/sysdeps/unix/sysv/linux/x86/bits/epoll.h b/sysdeps/unix/sysv/linux/x86/bits/epoll.h index 479645e97d..de908bcb12 100644 --- a/sysdeps/unix/sysv/linux/x86/bits/epoll.h +++ b/sysdeps/unix/sysv/linux/x86/bits/epoll.h @@ -22,10 +22,8 @@ /* Flags to be passed to epoll_create1. */ enum { - EPOLL_CLOEXEC = 02000000, + EPOLL_CLOEXEC = 02000000 #define EPOLL_CLOEXEC EPOLL_CLOEXEC - EPOLL_NONBLOCK = 00004000 -#define EPOLL_NONBLOCK EPOLL_NONBLOCK }; #define __EPOLL_PACKED __attribute__ ((__packed__)) -- cgit 1.4.1