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 /sysdeps/unix/sysv | |
parent | 2ccdea26f290f6990606f4a43de5272afa1a784d (diff) | |
download | glibc-c40ea3d9a3be8645441967cddf14645b84af5f2c.tar.gz glibc-c40ea3d9a3be8645441967cddf14645b84af5f2c.tar.xz glibc-c40ea3d9a3be8645441967cddf14645b84af5f2c.zip |
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 'sysdeps/unix/sysv')
-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 |
3 files changed, 3 insertions, 9 deletions
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__)) |