diff options
| author | Austin Foxley <austinf@cetoncorp.com> | 2010-04-02 09:25:02 -0700 |
|---|---|---|
| committer | Austin Foxley <austinf@cetoncorp.com> | 2010-04-02 09:25:02 -0700 |
| commit | ba3aaf137c521cdfdb8e16499dfadc977e5feb53 (patch) | |
| tree | b0099a7a04a670dc263ef29bd46adbce1d9bca55 /libc/sysdeps/linux | |
| parent | 4737dfdde5e78df1c5f6d4c7adc8351a0c788c9b (diff) | |
poll.c: fix incorrect merge
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'libc/sysdeps/linux')
| -rw-r--r-- | libc/sysdeps/linux/common/poll.c | 4 |
1 files changed, 1 insertions, 3 deletions
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, |