Consolidate NPTL sigprocmask.

git-mirror · Jun 12, 2014 · e876b09 · e876b09
1 parent f6b07b3
commit e876b09
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 20 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,8 @@
 2014-06-12  Roland McGrath  <roland@hack.frob.com>
 
+	* sysdeps/unix/sysv/linux/sigprocmask.c: Include <nptl/pthreadP.h>.
+	* nptl/sysdeps/pthread/sigprocmask.c: File removed.
+
 	* nptl/sysdeps/i386/i486/pthread_spin_trylock.S: Moved ...
 	* sysdeps/i386/i486/nptl/pthread_spin_trylock.S: ... here.
 	* nptl/sysdeps/i386/i586/pthread_spin_trylock.S: Moved ...

diff --git a/nptl/sysdeps/pthread/sigprocmask.c b/nptl/sysdeps/pthread/sigprocmask.c
diff --git a/sysdeps/unix/sysv/linux/sigprocmask.c b/sysdeps/unix/sysv/linux/sigprocmask.c
@@ -17,12 +17,13 @@
 
 #include <errno.h>
 #include <signal.h>
-#include <string.h>	/* Neede for string function builtin redirection.  */
+#include <string.h>  /* Needed for string function builtin redirection.  */
 #include <unistd.h>
 
 #include <sysdep.h>
 #include <sys/syscall.h>
 
+#include <nptl/pthreadP.h>              /* SIGCANCEL, SIGSETXID */
 #include <kernel-features.h>