This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[COMMITTED PATCH] Consolidate NPTL sigprocmask.
- From: Roland McGrath <roland at hack dot frob dot com>
- To: "GNU C. Library" <libc-alpha at sourceware dot org>
- Date: Thu, 12 Jun 2014 10:37:25 -0700 (PDT)
- Subject: [COMMITTED PATCH] Consolidate NPTL sigprocmask.
- Authentication-results: sourceware.org; auth=none
Verified no code changes on x86_64-linux-gnu.
Thanks,
Roland
* sysdeps/unix/sysv/linux/sigprocmask.c: Include <nptl/pthreadP.h>.
* nptl/sysdeps/pthread/sigprocmask.c: File removed.
--- a/nptl/sysdeps/pthread/sigprocmask.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright (C) 1997-2014 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, see
- <http://www.gnu.org/licenses/>. */
-
-#include <nptl/pthreadP.h>
-#include <sysdeps/unix/sysv/linux/sigprocmask.c>
--- 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>