[git commit nptl] poll.c: fix incorrect merge

Austin Foxley austinf at cetoncorp.com
Fri Apr 2 16:01:41 UTC 2010


commit: http://git.uclibc.org/uClibc/commit/?id=ba3aaf137c521cdfdb8e16499dfadc977e5feb53
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/nptl

Signed-off-by: Austin Foxley <austinf at cetoncorp.com>
---
 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 4211c26..3895e0d 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,
-- 
1.6.3.3



More information about the uClibc-cvs mailing list