This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]
GNU C Library master sources branch master updated. glibc-2.17-56-gc40ea3d

From: aj at sourceware dot org
To: glibc-cvs at sourceware dot org
Date: 8 Jan 2013 18:33:48 -0000
Subject: GNU C Library master sources branch master updated. glibc-2.17-56-gc40ea3d
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  c40ea3d9a3be8645441967cddf14645b84af5f2c (commit)
      from  2ccdea26f290f6990606f4a43de5272afa1a784d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=c40ea3d9a3be8645441967cddf14645b84af5f2c

commit c40ea3d9a3be8645441967cddf14645b84af5f2c
Author: Andreas Jaeger <aj@suse.de>
Date:   Tue Jan 8 19:32:00 2013 +0100

    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 b0e45ae..5390435 100644
--- 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 8a0da94..d0e02c6 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 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__))

-----------------------------------------------------------------------

Summary of changes:
 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(-)


hooks/post-receive
-- 
GNU C Library master sources
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]