diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -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 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/bits/epoll.h | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sparc/bits/epoll.h | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86/bits/epoll.h | 4 |
11 files changed, 31 insertions, 19 deletions
@@ -1,3 +1,11 @@ +2013-01-08 Andreas Jaeger <aj@suse.de> + + [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 <anton@samba.org> * sysdeps/powerpc/fpu/feholdexcpt.c: Fixed spelling errors. @@ -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 fcefcf7..2284ae3 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 814f903..2b79852 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 887527b..e3b2b06 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 72f57ef..e983d50 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 9f0db11..d9a0b1f 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 3276fd0..d8b8205 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 21b40d3..d8b8205 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 8c9968e..d984723 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 479645e..de908bc 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__)) |