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.

diff --git a/ChangeLog b/ChangeLog
index b0e45aea5baceba03f32532adb966235deb524e0..5390435014cea01bc0add5a6c85ff0a049b6c313 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.

diff --git a/NEWS b/NEWS
index 8a0da94c12c1dfbc47a33b72eadbf329dd1dd8c8..d0e02c6b1cbdfb8a6fc9900d46fd03f6209a2e21 100644 (file)
--- 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.
 
 \f
 Version 2.17

diff --git a/ports/ChangeLog.alpha b/ports/ChangeLog.alpha
index fcefcf717269b73dddf5ee1b5d6d0280c6c6cc42..2284ae3faa0f10def3a6d6c73fbbdbb49b3b4da4 100644 (file)
--- 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 814f903f3d8807e3807825f780ca1f570e415f5d..2b798529b939eea5f06c0757f4225b6d53836e0b 100644 (file)
--- 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 887527b25f8dd8705ad13144c3e5d0e3296540a0..e3b2b069ac924e19ca238b9d079384a32f794d8e 100644 (file)
--- 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 72f57ef5a57090781be3d358c12f84ba78575015..e983d506bb93886517a97491a483e9f9e0d3af3e 100644 (file)
--- 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 9f0db111d8b4f598a410f95a51ccecc9c3c8584e..d9a0b1f4e7c3591ed0b1f6d7783cd1756d22b6d0 100644 (file)
--- 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 3276fd0bb3038a0c3af54d87c69cd7e057cc470b..d8b82053e0a149db2b7b2eb919509cffb7370b6d 100644 (file)
--- 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 21b40d3cdcb8ee5405f8726e5b6a4e9bceeefb53..d8b82053e0a149db2b7b2eb919509cffb7370b6d 100644 (file)
--- 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 8c9968e353c5cf6a02e4b57a09293622a24eaf88..d984723653c22a84c86148be30a946b14838db25 100644 (file)
--- 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 479645e97d1e030484a6d6abc71385f97867da26..de908bcb12f7ac386d3f72ee83854dc2390f94f7 100644 (file)
--- 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__))