[git commit ldso-future] no need for hidden __sigpause, use an internal static function
Peter S. Mazinger
ps.m at gmx.net
Wed Apr 20 10:50:38 UTC 2011
commit: http://git.uclibc.org/uClibc/commit/?id=a7a4dc61d7f163d2eca2e8b5fc4be9c43a24bf39
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/ldso-future
Signed-off-by: Peter S. Mazinger <ps.m at gmx.net>
---
include/signal.h | 1 -
libc/signal/sigpause.c | 10 +++++-----
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/include/signal.h b/include/signal.h
index 455cd84..ca3e8ac 100644
--- a/include/signal.h
+++ b/include/signal.h
@@ -195,7 +195,6 @@ extern void psiginfo (__const siginfo_t *__pinfo, __const char *__s);
This function is a cancellation point and therefore not marked with
__THROW. */
extern int __sigpause (int __sig_or_mask, int __is_sig);
-libc_hidden_proto(__sigpause)
#ifdef __FAVOR_BSD
/* Set the mask of blocked signals to MASK,
diff --git a/libc/signal/sigpause.c b/libc/signal/sigpause.c
index e773b3c..ebd7af3 100644
--- a/libc/signal/sigpause.c
+++ b/libc/signal/sigpause.c
@@ -32,7 +32,7 @@
/* Set the mask of blocked signals to MASK,
wait for a signal to arrive, and then restore the mask. */
-int __sigpause (int sig_or_mask, int is_sig)
+static int __internal_sigpause (int sig_or_mask, int is_sig)
{
sigset_t set;
@@ -52,7 +52,7 @@ int __sigpause (int sig_or_mask, int is_sig)
to do anything here. */
return sigsuspend (&set);
}
-libc_hidden_def(__sigpause)
+strong_alias(__internal_sigpause,__sigpause)
#undef sigpause
@@ -63,16 +63,16 @@ int sigpause (int mask)
{
#ifdef __UCLIBC_HAS_THREADS_NATIVE__
if (SINGLE_THREAD_P)
- return __sigpause (mask, 0);
+ return __internal_sigpause (mask, 0);
int oldtype = LIBC_CANCEL_ASYNC ();
- int result = __sigpause (mask, 0);
+ int result = __internal_sigpause (mask, 0);
LIBC_CANCEL_RESET (oldtype);
return result;
#else
- return __sigpause (mask, 0);
+ return __internal_sigpause (mask, 0);
#endif
}
--
1.7.3.4
More information about the uClibc-cvs
mailing list