diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2009-02-25 11:06:29 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2009-02-25 11:06:29 +0000 |
| commit | 147041d26029fabdb35b596a1d3bcbb40c3de975 (patch) | |
| tree | dcd8320bbf30440ee47fe47130cbd1500ced80bd /libc/sysdeps/linux/common/poll.c | |
| parent | bdf8a6c4b863184545a15f63b9e28bd81e942859 (diff) | |
Reinstate __libc_foo's needed for linuxthreads.old.
Now they are only enabled if linuxthreads.old are selected.
Diffstat (limited to 'libc/sysdeps/linux/common/poll.c')
| -rw-r--r-- | libc/sysdeps/linux/common/poll.c | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/libc/sysdeps/linux/common/poll.c b/libc/sysdeps/linux/common/poll.c index e5f5f771f..4a6f06e19 100644 --- a/libc/sysdeps/linux/common/poll.c +++ b/libc/sysdeps/linux/common/poll.c @@ -20,18 +20,14 @@ #include <sys/syscall.h> #include <sys/poll.h> -extern __typeof(poll) __libc_poll; - #ifdef __NR_poll -# define __NR___libc_poll __NR_poll -_syscall3(int, __libc_poll, struct pollfd *, fds, +_syscall3(int, poll, struct pollfd *, fds, unsigned long int, nfds, int, timeout) #elif defined(__NR_ppoll) && defined __UCLIBC_LINUX_SPECIFIC__ -/* libc_hidden_proto(ppoll) */ -int __libc_poll(struct pollfd *fds, nfds_t nfds, int timeout) +int poll(struct pollfd *fds, nfds_t nfds, int timeout) { struct timespec *ts = NULL, tval; if (timeout > 0) { @@ -57,11 +53,6 @@ int __libc_poll(struct pollfd *fds, nfds_t nfds, int timeout) #include <sys/param.h> #include <unistd.h> -/* Experimentally off - libc_hidden_proto(memcpy) */ -/* Experimentally off - libc_hidden_proto(memset) */ -/* libc_hidden_proto(getdtablesize) */ -/* libc_hidden_proto(select) */ - /* uClinux 2.0 doesn't have poll, emulate it using select */ /* Poll the file descriptors described by the NFDS structures starting at @@ -70,7 +61,7 @@ int __libc_poll(struct pollfd *fds, nfds_t nfds, int timeout) Returns the number of file descriptors with events, zero if timed out, or -1 for errors. */ -int __libc_poll(struct pollfd *fds, nfds_t nfds, int timeout) +int poll(struct pollfd *fds, nfds_t nfds, int timeout) { static int max_fd_size; struct timeval tv; @@ -229,6 +220,10 @@ int __libc_poll(struct pollfd *fds, nfds_t nfds, int timeout) } #endif -/* libc_hidden_proto(poll) */ -weak_alias(__libc_poll,poll) + +#ifndef __LINUXTHREADS_OLD__ +libc_hidden_def(poll) +#else libc_hidden_weak(poll) +strong_alias(poll,__libc_poll) +#endif |