From e529793b508f47b5fb3a0a8bf5a1465a93a51dcd Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab@redhat.com>
Date: Tue, 13 Sep 2011 14:41:37 +0200
Subject: Avoid macro clash between <sys/select.h> and <linux/posix_types.h>

---
 misc/sys/select.h | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'misc/sys/select.h')

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
-- 
cgit 1.4.1