Browse Source

remove unneeded hidden sigwaitinfo

use __sigwaitinfo in sigwait.c, since that is already hidden

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 years ago
parent
commit
3c3f899b6d
3 changed files with 4 additions and 7 deletions
  1. 0 1
      include/signal.h
  2. 1 1
      libc/signal/sigwait.c
  3. 3 5
      libc/sysdeps/linux/common/__rt_sigwaitinfo.c

+ 0 - 1
include/signal.h

@@ -334,7 +334,6 @@ extern int sigwaitinfo (__const sigset_t *__restrict __set,
 #ifdef _LIBC
 #ifdef _LIBC
 extern __typeof(sigwaitinfo) __sigwaitinfo attribute_hidden;
 extern __typeof(sigwaitinfo) __sigwaitinfo attribute_hidden;
 #endif
 #endif
-libc_hidden_proto(sigwaitinfo)
 
 
 /* Select any of pending signals from SET and place information in INFO.
 /* Select any of pending signals from SET and place information in INFO.
    Wait the time specified by TIMEOUT if no signal is pending.
    Wait the time specified by TIMEOUT if no signal is pending.

+ 1 - 1
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 sigwait (const sigset_t *set, int *sig)
 {
 {
 	int ret = 1;
 	int ret = 1;
-	if ((ret = sigwaitinfo(set, NULL)) != -1) {
+	if ((ret = __sigwaitinfo(set, NULL)) != -1) {
 		*sig = ret;
 		*sig = ret;
 		return 0;
 		return 0;
 	}
 	}

+ 3 - 5
libc/sysdeps/linux/common/__rt_sigwaitinfo.c

@@ -75,15 +75,13 @@ int __sigwaitinfo(const sigset_t *set, siginfo_t *info)
 #  include <stddef.h>
 #  include <stddef.h>
 #  define __NR___rt_sigwaitinfo __NR_rt_sigtimedwait
 #  define __NR___rt_sigwaitinfo __NR_rt_sigtimedwait
 static _syscall4(int, __rt_sigwaitinfo, const sigset_t *, set,
 static _syscall4(int, __rt_sigwaitinfo, const sigset_t *, set,
-				 siginfo_t *, info, const struct timespec *, timeout,
+		 siginfo_t *, info, const struct timespec *, timeout,
-				 size_t, setsize);
+		 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);
 	return __rt_sigwaitinfo(set, info, NULL, _NSIG / 8);
 }
 }
 # endif
 # endif
-libc_hidden_proto(sigwaitinfo)
 weak_alias (__sigwaitinfo, sigwaitinfo)
 weak_alias (__sigwaitinfo, sigwaitinfo)
-libc_hidden_weak(sigwaitinfo)
 #endif
 #endif