[PATCH COMMITTED] was Re: conflict wrt. sigcontext definitions and use

[David Miller]

From: Roland McGrath <roland@hack.frob.com>
Date: Tue, 13 Jan 2015 10:33:27 -0800 (PST)

>> Any suggestions?  Is protecting the __sigreturn() declaration with
>> __USE_MISC the right thing to do?
> 
> That's probably the most right thing to do.  The other thing that is easy
> and sufficient is to just put a struct forward declaration right there.

I prefer the __USE_MISC guard, because if you haven't enabled
__USE_MISC then __sigreturn shouldn't be declared for you.

Committed to master, thanks Roland.

====================
[PATCH] Fix scanf15.c testsuite build on sparc.

	* include/signal.h (__sigreturn): Guard with __USE_MISC.
---
 ChangeLog        | 4 ++++
 include/signal.h | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 2e27ba7..b2b1163 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-01-13  David S. Miller  <davem@davemloft.net>
+
+	* include/signal.h (__sigreturn): Guard with __USE_MISC.
+
 2015-01-13  Roland McGrath  <roland@hack.frob.com>
 
 	* login/logout.c (logout): Use memset rather than bzero.
diff --git a/include/signal.h b/include/signal.h
index f631a62..b69de03 100644
--- a/include/signal.h
+++ b/include/signal.h
@@ -41,7 +41,9 @@ extern int __sigtimedwait (const sigset_t *__set, siginfo_t *__info,
 libc_hidden_proto (__sigtimedwait)
 extern int __sigqueue (__pid_t __pid, int __sig,
 		       const union sigval __val);
+#ifdef __USE_MISC
 extern int __sigreturn (struct sigcontext *__scp);
+#endif
 extern int __sigaltstack (const struct sigaltstack *__ss,
 			  struct sigaltstack *__oss);
 extern int __libc_sigaction (int sig, const struct sigaction *act,
-- 
2.1.2.532.g19b5d50