svn commit: trunk/uClibc: include libc/signal

[psm at uclibc.org]

Author: psm
Date: 2006-01-15 02:41:20 -0800 (Sun, 15 Jan 2006)
New Revision: 13344

Log:
revert 13331 and sync partly header w/ glibc, __sysv_signal is referenced in header, keep it visible

Modified:
   trunk/uClibc/include/signal.h
   trunk/uClibc/libc/signal/signal.c
   trunk/uClibc/libc/signal/sysv_signal.c


Changeset:
Modified: trunk/uClibc/include/signal.h
===================================================================
--- trunk/uClibc/include/signal.h	2006-01-15 10:30:54 UTC (rev 13343)
+++ trunk/uClibc/include/signal.h	2006-01-15 10:41:20 UTC (rev 13344)
@@ -93,8 +93,8 @@
      __THROW;
 #else
 /* Make sure the used `signal' implementation is the SVID version. */
-# ifdef __REDIRECT
-extern __sighandler_t __REDIRECT (signal,
+# ifdef __REDIRECT_NTH
+extern __sighandler_t __REDIRECT_NTH (signal,
 				      (int __sig, __sighandler_t __handler),
 				      __sysv_signal);
 # else

Modified: trunk/uClibc/libc/signal/signal.c
===================================================================
--- trunk/uClibc/libc/signal/signal.c	2006-01-15 10:30:54 UTC (rev 13343)
+++ trunk/uClibc/libc/signal/signal.c	2006-01-15 10:41:20 UTC (rev 13344)
@@ -28,8 +28,8 @@
 
 /* Set the handler for the signal SIG to HANDLER,
    returning the old handler, or SIG_ERR on error.  */
-__sighandler_t
-bsd_signal (int sig, __sighandler_t handler)
+attribute_hidden __sighandler_t
+__bsd_signal (int sig, __sighandler_t handler)
 {
   struct sigaction act, oact;
 
@@ -50,6 +50,7 @@
 
   return oact.sa_handler;
 }
-strong_alias(bsd_signal,signal)
+strong_alias(__bsd_signal,bsd_signal)
+strong_alias(__bsd_signal,signal)
 libc_hidden_proto(signal)
 libc_hidden_def(signal)

Modified: trunk/uClibc/libc/signal/sysv_signal.c
===================================================================
--- trunk/uClibc/libc/signal/sysv_signal.c	2006-01-15 10:30:54 UTC (rev 13343)
+++ trunk/uClibc/libc/signal/sysv_signal.c	2006-01-15 10:41:20 UTC (rev 13344)
@@ -36,7 +36,7 @@
 /* Set the handler for the signal SIG to HANDLER,
    returning the old handler, or SIG_ERR on error.  */
 __sighandler_t
-sysv_signal (sig, handler)
+__sysv_signal (sig, handler)
      int sig;
      __sighandler_t handler;
 {
@@ -59,3 +59,4 @@
 
   return oact.sa_handler;
 }
+strong_alias(__sysv_signal,sysv_signal)