diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2009-12-15 13:05:14 -0800 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2009-12-15 13:05:14 -0800 |
| commit | f282f6b90a52d95370392bd7a4e6ec1bbd90afe5 (patch) | |
| tree | 33157b9193068301df12130dbfbbcfeafb6b1c03 | |
| parent | 2af6396817fb9df98e63de75dd59fd999ee9f1d0 (diff) | |
| download | glibc-f282f6b90a52d95370392bd7a4e6ec1bbd90afe5.tar.gz glibc-f282f6b90a52d95370392bd7a4e6ec1bbd90afe5.tar.xz glibc-f282f6b90a52d95370392bd7a4e6ec1bbd90afe5.zip | |
Update poll.h header for POSIX 2008.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | bits/poll.h | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/bits/poll.h | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sparc/bits/poll.h | 4 |
4 files changed, 13 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index b1e14b664e..35d0a57f4f 100644 --- 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 022a06cc1b..0ee9b00583 100644 --- 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 d7996b46c5..9dd75cb3af 100644 --- 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 53b94bc50e..0a984ad765 100644 --- 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. */ |