Update poll.h header for POSIX 2008.

diff --git a/ChangeLog b/ChangeLog
index b1e14b6..35d0a57 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2009-12-15  Ulrich Drepper  <drepper@redhat.com>
 
+       [BZ #11093]
+       * bits/poll.h: Define POLLRDNORM, POLLRDBAND, POLLWRNORM, and
+       POLLWRBAND also for POSIX 2008.
+       * sysdeps/unix/sysv/linux/bits/poll.h: Likewise.
+       * sysdeps/unix/sysv/linux/sparc/bits/poll.h: Likewise.
+
        * include/link.h (struct link_map): Move l_used into its own word.
        * elf/dl-lookup.c (_dl_lookup_symbol_x): Only update l_used when it is
        still zero.

diff --git a/bits/poll.h b/bits/poll.h
index 022a06c..0ee9b00 100644 (file)
--- a/bits/poll.h
+++ b/bits/poll.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 2000, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 2000, 2001, 2009 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -27,8 +27,8 @@
 #define POLLPRI                02              /* There is urgent data to read.  */
 #define POLLOUT                04              /* Writing now will not block.  */
 
-#ifdef __USE_XOPEN
-/* These values are defined in XPG4.2.  */
+#if defined __USE_XOPEN || defined __USE_XOPEN2K8
+/* These values are defined in XPG4.2 and later.  */
 # define POLLRDNORM    POLLIN          /* Normal data may be read.  */
 # define POLLRDBAND    POLLPRI         /* Priority data may be read.  */
 # define POLLWRNORM    POLLOUT         /* Writing now will not block.  */

diff --git a/sysdeps/unix/sysv/linux/bits/poll.h b/sysdeps/unix/sysv/linux/bits/poll.h
index d7996b4..9dd75cb 100644 (file)
--- a/sysdeps/unix/sysv/linux/bits/poll.h
+++ b/sysdeps/unix/sysv/linux/bits/poll.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 2001, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 2001, 2006, 2009 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
 #define POLLPRI                0x002           /* There is urgent data to read.  */
 #define POLLOUT                0x004           /* Writing now will not block.  */
 
-#ifdef __USE_XOPEN
+#if defined __USE_XOPEN || defined __USE_XOPEN2K8
 /* These values are defined in XPG4.2.  */
 # define POLLRDNORM    0x040           /* Normal data may be read.  */
 # define POLLRDBAND    0x080           /* Priority data may be read.  */

diff --git a/sysdeps/unix/sysv/linux/sparc/bits/poll.h b/sysdeps/unix/sysv/linux/sparc/bits/poll.h
index 53b94bc..0a984ad 100644 (file)
--- a/sysdeps/unix/sysv/linux/sparc/bits/poll.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/poll.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 2001, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 2001, 2006, 2009 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -27,7 +27,7 @@
 #define POLLPRI                0x002           /* There is urgent data to read.  */
 #define POLLOUT                0x004           /* Writing now will not block.  */
 
-#ifdef __USE_XOPEN
+#if defined __USE_XOPEN || defined __USE_XOPEN2K8
 /* These values are defined in XPG4.2.  */
 # define POLLRDNORM    0x040           /* Normal data may be read.  */
 # define POLLRDBAND    0x080           /* Priority data may be read.  */