瀏覽代碼

no need for hidden sigtimedwait

remove unneeded attribute_hidden too, as the prototype provides it

Signed-off-by: Peter S. Mazinger <ps.m@gmx.net>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Peter S. Mazinger 14 年之前
父節點
當前提交
5fce95b146

+ 0 - 1
include/signal.h

@@ -348,7 +348,6 @@ extern int sigtimedwait (__const sigset_t *__restrict __set,
 #ifdef _LIBC
 extern __typeof(sigtimedwait) __sigtimedwait attribute_hidden;
 #endif
-libc_hidden_proto(sigtimedwait)
 
 /* Send signal SIG to the process PID.  Associate data in VAL with the
    signal.  */

+ 6 - 7
libc/sysdeps/linux/common/__rt_sigtimedwait.c

@@ -56,8 +56,8 @@ static int do_sigtimedwait(const sigset_t *set, siginfo_t *info,
 }
 
 /* Return any pending signal or wait for one for the given time.  */
-int attribute_hidden __sigtimedwait(const sigset_t *set, siginfo_t *info,
-				    const struct timespec *timeout)
+int __sigtimedwait(const sigset_t *set, siginfo_t *info,
+		   const struct timespec *timeout)
 {
 	if(SINGLE_THREAD_P)
 		return do_sigtimedwait(set, info, timeout);
@@ -77,15 +77,14 @@ int attribute_hidden __sigtimedwait(const sigset_t *set, siginfo_t *info,
 #  include <stddef.h>
 #  define __NR___rt_sigtimedwait __NR_rt_sigtimedwait
 static _syscall4(int, __rt_sigtimedwait, 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 __sigtimedwait(const sigset_t * set, siginfo_t * info,
-									const struct timespec *timeout)
+int __sigtimedwait(const sigset_t * set, siginfo_t * info,
+		   const struct timespec *timeout)
 {
 	return __rt_sigtimedwait(set, info, timeout, _NSIG / 8);
 }
 # endif /* !__UCLIBC_HAS_THREADS_NATIVE__ */
 weak_alias(__sigtimedwait,sigtimedwait)
-libc_hidden_weak(sigtimedwait)
 #endif

+ 1 - 1
libpthread/nptl/sysdeps/unix/sysv/linux/sigtimedwait.c

@@ -67,7 +67,7 @@ do_sigtimedwait (const sigset_t *set, siginfo_t *info,
 
 
 /* Return any pending signal or wait for one for the given time.  */
-int attribute_hidden
+int
 __sigtimedwait (const sigset_t *set, siginfo_t *info,
 		const struct timespec *timeout)
 {