From 58f56583d7f58866f788d3a2a870b1198d98de03 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Thu, 26 Aug 2004 20:45:07 -0700 Subject: [PATCH] [PATCH] Fix x86_64 vs select.c namespace clash fs/select.c:122:1: warning: "__IN" redefined In file included from include/linux/timex.h:61, from include/linux/sched.h:11, from include/linux/module.h:10, from fs/select.c:17: include/asm/io.h:70:1: warning: this is the location of the previous definition fs/select.c:123:1: warning: "__OUT" redefined include/asm/io.h:60:1: warning: this is the location of the previous definition Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- fs/select.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/fs/select.c b/fs/select.c index 16fc1ef95981b..4dbc1d99a05ef 100644 --- a/fs/select.c +++ b/fs/select.c @@ -118,15 +118,11 @@ void __pollwait(struct file *filp, wait_queue_head_t *wait_address, poll_table * } } +#define FDS_IN(fds, n) (fds->in + n) +#define FDS_OUT(fds, n) (fds->out + n) +#define FDS_EX(fds, n) (fds->ex + n) -#define __IN(fds, n) (fds->in + n) -#define __OUT(fds, n) (fds->out + n) -#define __EX(fds, n) (fds->ex + n) -#define __RES_IN(fds, n) (fds->res_in + n) -#define __RES_OUT(fds, n) (fds->res_out + n) -#define __RES_EX(fds, n) (fds->res_ex + n) - -#define BITS(fds, n) (*__IN(fds, n)|*__OUT(fds, n)|*__EX(fds, n)) +#define BITS(fds, n) (*FDS_IN(fds, n)|*FDS_OUT(fds, n)|*FDS_EX(fds, n)) static int max_select_fd(unsigned long n, fd_set_bits *fds) { -- 2.53.0