diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-12-10 23:04:41 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-12-10 23:04:41 +0000 |
| commit | 9184de4614953897215e989b8720ad7fe6cfde86 (patch) | |
| tree | 3fbdd8c59ed45fee7162fc51241cb59ee51afcf2 /libpthread/nptl/sysdeps | |
| parent | f335b8c0ffb5fd7ae44d154900d78988b6abf769 (diff) | |
| download | uClibc-alpine-9184de4614953897215e989b8720ad7fe6cfde86.tar.bz2 uClibc-alpine-9184de4614953897215e989b8720ad7fe6cfde86.tar.xz | |
Finish merge from trunk, again, no really.
Diffstat (limited to 'libpthread/nptl/sysdeps')
| -rw-r--r-- | libpthread/nptl/sysdeps/pthread/sigaction.c | 2 | ||||
| -rw-r--r-- | libpthread/nptl/sysdeps/unix/sysv/linux/sigwaitinfo.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/libpthread/nptl/sysdeps/pthread/sigaction.c b/libpthread/nptl/sysdeps/pthread/sigaction.c index b1efb5c37..6ab8a5279 100644 --- a/libpthread/nptl/sysdeps/pthread/sigaction.c +++ b/libpthread/nptl/sysdeps/pthread/sigaction.c @@ -42,7 +42,7 @@ __sigaction (sig, act, oact) return -1; } - return __sigaction_internal (sig, act, oact); + return __libc_sigaction (sig, act, oact); } weak_alias(__sigaction, sigaction) diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sigwaitinfo.c b/libpthread/nptl/sysdeps/unix/sysv/linux/sigwaitinfo.c index 4342cedf1..c6ea739d3 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/sigwaitinfo.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sigwaitinfo.c @@ -68,8 +68,10 @@ do_sigwaitinfo (const sigset_t *set, siginfo_t *info) /* Return any pending signal or wait for one for the given time. */ -int attribute_hidden -__sigwaitinfo (const sigset_t *set, siginfo_t *info) +int +__sigwaitinfo (set, info) + const sigset_t *set; + siginfo_t *info; { if (SINGLE_THREAD_P) return do_sigwaitinfo (set, info); |