|
|
c6d234 |
Change function declarations and definitions related to sigvec.
|
|
|
c6d234 |
Addressed upstream with the removal of sigvec in this commit:
|
|
|
c6d234 |
|
|
|
c6d234 |
commit 0781a7772ae1385fe8d7a734fdb35df81b1e6590
|
|
|
c6d234 |
Author: Roland McGrath <roland@hack.frob.com>
|
|
|
c6d234 |
Date: Fri Nov 14 10:52:16 2014 -0800
|
|
|
c6d234 |
|
|
|
c6d234 |
Remove sigvec.
|
|
|
c6d234 |
|
|
|
c6d234 |
diff --git a/include/signal.h b/include/signal.h
|
|
|
c6d234 |
index a019395882176073..d9f279c9bf0aca3d 100644
|
|
|
c6d234 |
--- a/include/signal.h
|
|
|
c6d234 |
+++ b/include/signal.h
|
|
|
c6d234 |
@@ -40,6 +40,7 @@ extern int __sigtimedwait (const sigset_t *__set, siginfo_t *__info,
|
|
|
c6d234 |
libc_hidden_proto (__sigtimedwait)
|
|
|
c6d234 |
extern int __sigqueue (__pid_t __pid, int __sig,
|
|
|
c6d234 |
const union sigval __val);
|
|
|
c6d234 |
+struct sigvec;
|
|
|
c6d234 |
extern int __sigvec (int __sig, const struct sigvec *__vec,
|
|
|
c6d234 |
struct sigvec *__ovec);
|
|
|
c6d234 |
extern int __sigreturn (struct sigcontext *__scp);
|
|
|
c6d234 |
diff --git a/signal/sigvec.c b/signal/sigvec.c
|
|
|
c6d234 |
index e44daf1ab6fd2f39..21e304d944e46c18 100644
|
|
|
c6d234 |
--- a/signal/sigvec.c
|
|
|
c6d234 |
+++ b/signal/sigvec.c
|
|
|
c6d234 |
@@ -24,10 +24,7 @@
|
|
|
c6d234 |
reset to SIG_DFL before `sv_handler' is entered. If OVEC is non-NULL,
|
|
|
c6d234 |
it is filled in with the old information for SIG. */
|
|
|
c6d234 |
int
|
|
|
c6d234 |
-__sigvec (sig, vec, ovec)
|
|
|
c6d234 |
- int sig;
|
|
|
c6d234 |
- const struct sigvec *vec;
|
|
|
c6d234 |
- struct sigvec *ovec;
|
|
|
c6d234 |
+__sigvec (int sig, const struct sigvec *vec, struct sigvec *ovec)
|
|
|
c6d234 |
{
|
|
|
c6d234 |
__set_errno (ENOSYS);
|
|
|
c6d234 |
return -1;
|
|
|
c6d234 |
diff --git a/sysdeps/posix/sigvec.c b/sysdeps/posix/sigvec.c
|
|
|
c6d234 |
index 89e3d44d88ce3ee5..6a3ccc8eaf8ae0a5 100644
|
|
|
c6d234 |
--- a/sysdeps/posix/sigvec.c
|
|
|
c6d234 |
+++ b/sysdeps/posix/sigvec.c
|
|
|
c6d234 |
@@ -43,10 +43,7 @@ static struct sigvec_wrapper_data sigvec_wrapper_data[NSIG];
|
|
|
c6d234 |
reset to SIG_DFL before `sv_handler' is entered. If OVEC is non-NULL,
|
|
|
c6d234 |
it is filled in with the old information for SIG. */
|
|
|
c6d234 |
int
|
|
|
c6d234 |
-__sigvec (sig, vec, ovec)
|
|
|
c6d234 |
- int sig;
|
|
|
c6d234 |
- const struct sigvec *vec;
|
|
|
c6d234 |
- struct sigvec *ovec;
|
|
|
c6d234 |
+__sigvec (int sig, const struct sigvec *vec, struct sigvec *ovec)
|
|
|
c6d234 |
{
|
|
|
c6d234 |
struct sigaction old;
|
|
|
c6d234 |
|
|
|
c6d234 |
@@ -159,8 +156,7 @@ weak_alias (__sigvec, sigvec)
|
|
|
c6d234 |
|
|
|
c6d234 |
#ifndef SA_RESETHAND
|
|
|
c6d234 |
static void
|
|
|
c6d234 |
-sigvec_wrapper_handler (sig)
|
|
|
c6d234 |
- int sig;
|
|
|
c6d234 |
+sigvec_wrapper_handler (int sig)
|
|
|
c6d234 |
{
|
|
|
c6d234 |
struct sigvec_wrapper_data *data;
|
|
|
c6d234 |
struct sigaction act;
|