diff options
author | Andreas Schwab <schwab@redhat.com> | 2011-09-13 14:41:37 +0200 |
---|---|---|
committer | Andreas Schwab <schwab@redhat.com> | 2011-09-13 15:16:38 +0200 |
commit | e529793b508f47b5fb3a0a8bf5a1465a93a51dcd (patch) | |
tree | 3f0378716ec6f9fb1fb4242182ff51467d9bb962 /ChangeLog | |
parent | 52d4fef8be8742ce1d0b4654bd5fcd5d9143dfb6 (diff) | |
download | glibc-e529793b508f47b5fb3a0a8bf5a1465a93a51dcd.tar.gz glibc-e529793b508f47b5fb3a0a8bf5a1465a93a51dcd.tar.xz glibc-e529793b508f47b5fb3a0a8bf5a1465a93a51dcd.zip |
Avoid macro clash between <sys/select.h> and <linux/posix_types.h>
Diffstat (limited to 'ChangeLog')
-rw-r--r-- | ChangeLog | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 95b1fac64c..7eb623ceca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,15 @@ 2011-09-13 Andreas Schwab <schwab@redhat.com> + * misc/sys/select.h (__FD_MASK): Renamed from __FDMASK. + (__FD_ELT): Renamed from __FDELT. + * misc/bits/select2.h (__FD_ELT): Likewise. + * bits/select.h (__FD_SET, __FD_CLR, __FD_ISSET): Use __FD_ELT, + __FD_MASK instead of __FDELT, __FDMASK. + * sysdeps/i386/bits/select.h (__FD_SET, __FD_CLR, __FD_ISSET): + Likewise. + * sysdeps/x86_64/bits/select.h (__FD_SET, __FD_CLR, __FD_ISSET): + Likewise. + * elf/Makefile (gen-ldd): Fix pattern. * elf/rtld.c (dl_main): Only use USE___THREAD when defined. |