From b823b17fa7dc5a15d822a4f31fe8ee846a65cfae Mon Sep 17 00:00:00 2001
From: "\"Steven J. Hill\"" <sjhill@realitydiluted.com>
Date: Wed, 16 Nov 2005 03:36:39 +0000
Subject: Sync with glibc reference tree and changes for uClibc thus far.

---
 libpthread/nptl/sysdeps/pthread/sigaction.c | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

(limited to 'libpthread/nptl/sysdeps/pthread/sigaction.c')

diff --git a/libpthread/nptl/sysdeps/pthread/sigaction.c b/libpthread/nptl/sysdeps/pthread/sigaction.c
index 62f9daa3c..6ec1153ba 100644
--- a/libpthread/nptl/sysdeps/pthread/sigaction.c
+++ b/libpthread/nptl/sysdeps/pthread/sigaction.c
@@ -22,32 +22,19 @@
    exact file anyway.  */
 #ifndef LIBC_SIGACTION
 
-#include <features.h>
-
-#ifdef __UCLIBC__
-#include <errno.h>
-#include <signal.h>
 #include <pthreadP.h>
-#else
-#include <nptl/pthreadP.h>
-#endif
 
 /* We use the libc implementation but we tell it to not allow
    SIGCANCEL or SIGTIMER to be handled.  */
 # define LIBC_SIGACTION	1
 
-#ifndef __UCLIBC__
-# include <nptl/sysdeps/pthread/sigaction.c>
+# include_next <sigaction.c>
 
 int
 __sigaction (sig, act, oact)
      int sig;
      const struct sigaction *act;
      struct sigaction *oact;
-#else
-int
-__sigaction (int sig, const struct sigaction *act, struct sigaction *oact)
-#endif
 {
   if (__builtin_expect (sig == SIGCANCEL || sig == SIGSETXID, 0))
     {
@@ -55,16 +42,10 @@ __sigaction (int sig, const struct sigaction *act, struct sigaction *oact)
       return -1;
     }
 
-#ifdef __UCLIBC__
-  return sigaction (sig, act, oact);
-#else
   return __libc_sigaction (sig, act, oact);
-#endif
 }
 libc_hidden_weak (__sigaction)
-#ifndef __UCLIBC__
 weak_alias (__sigaction, sigaction)
-#endif
 
 #else
 
-- 
cgit v1.2.3