[git commit] remove unneeded hidden sigwaitinfo
Bernhard Reutner-Fischer
rep.dot.nop at gmail.com
Fri Jun 15 12:00:22 UTC 2012
commit: http://git.uclibc.org/uClibc/commit/?id=3c3f899b6d2ff68d3d6f1ef8f752218d8dd594ea
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/master
use __sigwaitinfo in sigwait.c, since that is already hidden
Signed-off-by: Peter S. Mazinger <ps.m at gmx.net>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
---
include/signal.h | 1 -
libc/signal/sigwait.c | 2 +-
libc/sysdeps/linux/common/__rt_sigwaitinfo.c | 8 +++-----
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/include/signal.h b/include/signal.h
index eb868bb..3c64fd5 100644
--- a/include/signal.h
+++ b/include/signal.h
@@ -334,7 +334,6 @@ extern int sigwaitinfo (__const sigset_t *__restrict __set,
#ifdef _LIBC
extern __typeof(sigwaitinfo) __sigwaitinfo attribute_hidden;
#endif
-libc_hidden_proto(sigwaitinfo)
/* Select any of pending signals from SET and place information in INFO.
Wait the time specified by TIMEOUT if no signal is pending.
diff --git a/libc/signal/sigwait.c b/libc/signal/sigwait.c
index 8fd7ea8..634a18d 100644
--- a/libc/signal/sigwait.c
+++ b/libc/signal/sigwait.c
@@ -96,7 +96,7 @@ int sigwait (const sigset_t *set, int *sig)
int sigwait (const sigset_t *set, int *sig)
{
int ret = 1;
- if ((ret = sigwaitinfo(set, NULL)) != -1) {
+ if ((ret = __sigwaitinfo(set, NULL)) != -1) {
*sig = ret;
return 0;
}
diff --git a/libc/sysdeps/linux/common/__rt_sigwaitinfo.c b/libc/sysdeps/linux/common/__rt_sigwaitinfo.c
index 6b43327..74db6d6 100644
--- a/libc/sysdeps/linux/common/__rt_sigwaitinfo.c
+++ b/libc/sysdeps/linux/common/__rt_sigwaitinfo.c
@@ -75,15 +75,13 @@ int __sigwaitinfo(const sigset_t *set, siginfo_t *info)
# include <stddef.h>
# define __NR___rt_sigwaitinfo __NR_rt_sigtimedwait
static _syscall4(int, __rt_sigwaitinfo, const sigset_t *, set,
- siginfo_t *, info, const struct timespec *, timeout,
- size_t, setsize);
+ siginfo_t *, info, const struct timespec *, timeout,
+ size_t, setsize);
-int attribute_hidden __sigwaitinfo(const sigset_t * set, siginfo_t * info)
+int __sigwaitinfo(const sigset_t * set, siginfo_t * info)
{
return __rt_sigwaitinfo(set, info, NULL, _NSIG / 8);
}
# endif
-libc_hidden_proto(sigwaitinfo)
weak_alias (__sigwaitinfo, sigwaitinfo)
-libc_hidden_weak(sigwaitinfo)
#endif
More information about the uClibc-cvs
mailing list