svn commit: branches/uClibc-nptl/libc: signal sysdeps/linux/common

[sjhill at uclibc.org]

Author: sjhill
Date: 2005-12-10 11:08:01 -0800 (Sat, 10 Dec 2005)
New Revision: 12826

Log:
Finish merges from trunk.


Modified:
   branches/uClibc-nptl/libc/signal/sigwait.c
   branches/uClibc-nptl/libc/sysdeps/linux/common/__rt_sigtimedwait.c


Changeset:
Modified: branches/uClibc-nptl/libc/signal/sigwait.c
===================================================================
--- branches/uClibc-nptl/libc/signal/sigwait.c	2005-12-10 18:45:05 UTC (rev 12825)
+++ branches/uClibc-nptl/libc/signal/sigwait.c	2005-12-10 19:08:01 UTC (rev 12826)
@@ -18,6 +18,8 @@
  * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
  * 02111-1307 USA.  */
 
+#define sigwaitinfo __sigwaitinfo
+
 #include <errno.h>
 #include <signal.h>
 #include <string.h>

Modified: branches/uClibc-nptl/libc/sysdeps/linux/common/__rt_sigtimedwait.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/common/__rt_sigtimedwait.c	2005-12-10 18:45:05 UTC (rev 12825)
+++ branches/uClibc-nptl/libc/sysdeps/linux/common/__rt_sigtimedwait.c	2005-12-10 19:08:01 UTC (rev 12826)
@@ -26,10 +26,8 @@
 {
 	return __rt_sigtimedwait(set, info, timeout, _NSIG / 8);
 }
-weak_alias (__sigtimedwait, sigtimedwait)
-weak_alias (__sigwaitinfo, sigwaitinfo)
 #else
-int sigwaitinfo(const sigset_t * set, siginfo_t * info)
+int attribute_hidden __sigwaitinfo(const sigset_t * set, siginfo_t * info)
 {
 	if (set == NULL)
 		__set_errno(EINVAL);
@@ -38,7 +36,7 @@
 	return -1;
 }
 
-int sigtimedwait(const sigset_t * set, siginfo_t * info,
+int attribute_hidden __sigtimedwait(const sigset_t * set, siginfo_t * info,
 				 const struct timespec *timeout)
 {
 	if (set == NULL)
@@ -48,3 +46,6 @@
 	return -1;
 }
 #endif
+/* keep these weak so that libpthread can overwrite them */
+weak_alias(__sigtimedwait,sigtimedwait)
+weak_alias(__sigwaitinfo,sigwaitinfo)