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 /misc | |
| 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 'misc')
| -rw-r--r-- | misc/bits/select2.h | 4 | ||||
| -rw-r--r-- | misc/sys/select.h | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/misc/bits/select2.h b/misc/bits/select2.h index 27f42018f2..37c4827f1c 100644 --- a/misc/bits/select2.h +++ b/misc/bits/select2.h @@ -25,8 +25,8 @@ extern unsigned long int __fdelt_chk (unsigned long int __d); extern unsigned long int __fdelt_warn (unsigned long int __d) __warnattr ("bit outside of fd_set selected"); -#undef __FDELT -#define __FDELT(d) \ +#undef __FD_ELT +#define __FD_ELT(d) \ ({ unsigned long int __d = d; \ (__builtin_constant_p (__d) \ ? (__d >= __FD_SETSIZE \ diff --git a/misc/sys/select.h b/misc/sys/select.h index 295d3bb6c4..97f2b3d65f 100644 --- a/misc/sys/select.h +++ b/misc/sys/select.h @@ -54,14 +54,12 @@ typedef __suseconds_t suseconds_t; /* The fd_set member is required to be an array of longs. */ typedef long int __fd_mask; -/* Some versions of <linux/posix_types.h> define these macros. */ +/* Some versions of <linux/posix_types.h> define this macros. */ #undef __NFDBITS -#undef __FDELT -#undef __FDMASK /* It's easier to assume 8-bit bytes than to get CHAR_BIT. */ #define __NFDBITS (8 * (int) sizeof (__fd_mask)) -#define __FDELT(d) ((d) / __NFDBITS) -#define __FDMASK(d) ((__fd_mask) 1 << ((d) % __NFDBITS)) +#define __FD_ELT(d) ((d) / __NFDBITS) +#define __FD_MASK(d) ((__fd_mask) 1 << ((d) % __NFDBITS)) /* fd_set for select and pselect. */ typedef struct |