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 /sysdeps | |
| parent | 52d4fef8be8742ce1d0b4654bd5fcd5d9143dfb6 (diff) | |
| download | glibc-e529793b508f47b5fb3a0a8bf5a1465a93a51dcd.zip glibc-e529793b508f47b5fb3a0a8bf5a1465a93a51dcd.tar.gz glibc-e529793b508f47b5fb3a0a8bf5a1465a93a51dcd.tar.bz2 | |
Avoid macro clash between <sys/select.h> and <linux/posix_types.h>
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/i386/bits/select.h | 6 | ||||
| -rw-r--r-- | sysdeps/x86_64/bits/select.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sysdeps/i386/bits/select.h b/sysdeps/i386/bits/select.h index ab9aa3d..9e4c56a 100644 --- a/sysdeps/i386/bits/select.h +++ b/sysdeps/i386/bits/select.h @@ -48,8 +48,8 @@ #endif /* GNU CC */ #define __FD_SET(d, set) \ - ((void) (__FDS_BITS (set)[__FDELT (d)] |= __FDMASK (d))) + ((void) (__FDS_BITS (set)[__FD_ELT (d)] |= __FD_MASK (d))) #define __FD_CLR(d, set) \ - ((void) (__FDS_BITS (set)[__FDELT (d)] &= ~__FDMASK (d))) + ((void) (__FDS_BITS (set)[__FD_ELT (d)] &= ~__FD_MASK (d))) #define __FD_ISSET(d, set) \ - ((__FDS_BITS (set)[__FDELT (d)] & __FDMASK (d)) != 0) + ((__FDS_BITS (set)[__FD_ELT (d)] & __FD_MASK (d)) != 0) diff --git a/sysdeps/x86_64/bits/select.h b/sysdeps/x86_64/bits/select.h index a300d58..2ebdd7c 100644 --- a/sysdeps/x86_64/bits/select.h +++ b/sysdeps/x86_64/bits/select.h @@ -57,8 +57,8 @@ #endif /* GNU CC */ #define __FD_SET(d, set) \ - ((void) (__FDS_BITS (set)[__FDELT (d)] |= __FDMASK (d))) + ((void) (__FDS_BITS (set)[__FD_ELT (d)] |= __FD_MASK (d))) #define __FD_CLR(d, set) \ - ((void) (__FDS_BITS (set)[__FDELT (d)] &= ~__FDMASK (d))) + ((void) (__FDS_BITS (set)[__FD_ELT (d)] &= ~__FD_MASK (d))) #define __FD_ISSET(d, set) \ - ((__FDS_BITS (set)[__FDELT (d)] & __FDMASK (d)) != 0) + ((__FDS_BITS (set)[__FD_ELT (d)] & __FD_MASK (d)) != 0) |