From ba3aaf137c521cdfdb8e16499dfadc977e5feb53 Mon Sep 17 00:00:00 2001 From: Austin Foxley Date: Fri, 2 Apr 2010 09:25:02 -0700 Subject: poll.c: fix incorrect merge Signed-off-by: Austin Foxley --- libc/sysdeps/linux/common/poll.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'libc/sysdeps/linux/common/poll.c') diff --git a/libc/sysdeps/linux/common/poll.c b/libc/sysdeps/linux/common/poll.c index 4211c26cc..3895e0da7 100644 --- a/libc/sysdeps/linux/common/poll.c +++ b/libc/sysdeps/linux/common/poll.c @@ -27,11 +27,9 @@ #define SINGLE_THREAD_P 1 #endif -#if defined __ASSUME_POLL_SYSCALL && defined __NR_poll - libc_hidden_proto(poll) -#ifdef __NR_poll +#if defined __ASSUME_POLL_SYSCALL && defined __NR_poll #define __NR___syscall_poll __NR_poll static inline _syscall3(int, __syscall_poll, struct pollfd *, fds, -- cgit v1.2.3