From 187eb613ecbfb6350ba8eba34601f47b70b61b3a Mon Sep 17 00:00:00 2001 From: "\"Steven J. Hill\"" Date: Sat, 10 Dec 2005 19:08:01 +0000 Subject: Finish merges from trunk. --- libc/sysdeps/linux/common/__rt_sigtimedwait.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'libc/sysdeps/linux/common/__rt_sigtimedwait.c') 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) -- cgit v1.2.3