diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-12-10 19:08:01 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-12-10 19:08:01 +0000 |
| commit | 187eb613ecbfb6350ba8eba34601f47b70b61b3a (patch) | |
| tree | e4a25a036c039d57885a09a8c856c9b0da91229d | |
| parent | de75ca704ea62dce9e62b6e1289da796b0567f8f (diff) | |
| download | uClibc-alpine-187eb613ecbfb6350ba8eba34601f47b70b61b3a.tar.bz2 uClibc-alpine-187eb613ecbfb6350ba8eba34601f47b70b61b3a.tar.xz | |
Finish merges from trunk.
| -rw-r--r-- | libc/signal/sigwait.c | 2 | ||||
| -rw-r--r-- | libc/sysdeps/linux/common/__rt_sigtimedwait.c | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/libc/signal/sigwait.c b/libc/signal/sigwait.c index 99ddfc481..13d65ed5e 100644 --- a/libc/signal/sigwait.c +++ b/libc/signal/sigwait.c @@ -18,6 +18,8 @@ * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA * 02111-1307 USA. */ +#define sigwaitinfo __sigwaitinfo + #include <errno.h> #include <signal.h> #include <string.h> diff --git a/libc/sysdeps/linux/common/__rt_sigtimedwait.c b/libc/sysdeps/linux/common/__rt_sigtimedwait.c index 8862bc95b..09409fe81 100644 --- a/libc/sysdeps/linux/common/__rt_sigtimedwait.c +++ b/libc/sysdeps/linux/common/__rt_sigtimedwait.c @@ -26,10 +26,8 @@ int attribute_hidden __sigtimedwait(const sigset_t * set, siginfo_t * info, { return __rt_sigtimedwait(set, info, timeout, _NSIG / 8); } -weak_alias (__sigtimedwait, sigtimedwait) -weak_alias (__sigwaitinfo, sigwaitinfo) #else -int sigwaitinfo(const sigset_t * set, siginfo_t * info) +int attribute_hidden __sigwaitinfo(const sigset_t * set, siginfo_t * info) { if (set == NULL) __set_errno(EINVAL); @@ -38,7 +36,7 @@ int sigwaitinfo(const sigset_t * set, siginfo_t * info) return -1; } -int sigtimedwait(const sigset_t * set, siginfo_t * info, +int attribute_hidden __sigtimedwait(const sigset_t * set, siginfo_t * info, const struct timespec *timeout) { if (set == NULL) @@ -48,3 +46,6 @@ int sigtimedwait(const sigset_t * set, siginfo_t * info, return -1; } #endif +/* keep these weak so that libpthread can overwrite them */ +weak_alias(__sigtimedwait,sigtimedwait) +weak_alias(__sigwaitinfo,sigwaitinfo) |