From patchwork Tue Jan 13 19:29:56 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Miller X-Patchwork-Id: 428639 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 7F3F614017B for ; Wed, 14 Jan 2015 06:30:08 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:message-id:to:cc:subject:from:in-reply-to :references:mime-version:content-type:content-transfer-encoding; q=dns; s=default; b=Nk2wtWaX6owXS+/Q2bio4DltOFKPd/4UqZRBkJdaWlq Zp/wOYxVvLeHbAoEzX9fnSIBqzDuI6/zEeChdkcyVmyU6jX82gxZd13+Ztp3NQfS D6LyAcziUA4FN3xsvy43y86TYm8CFd4EBlzYEUmLab5Jr7NtvWNw4kLJZNMwXeDM = DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:message-id:to:cc:subject:from:in-reply-to :references:mime-version:content-type:content-transfer-encoding; s=default; bh=RM+RIt2JXx2lE1WIbuM0w56WcgY=; b=rRPUMFX0QIlEWoyG+ G5P6YVNLB6l/vqv23Kr/vjYCA/6KMU5I7cAR87sApp4g1WQ+VY1Pp+wu9An+UrXa TcZzkV5Z//mJN1RmV1i89IODu02rIkGJGpzBBGzY2tJXyg0Ic+/zZNLJdNPUO8hp e/U8HFOv/RqtVot+iZn6znYGGk= Received: (qmail 25840 invoked by alias); 13 Jan 2015 19:30:02 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 25792 invoked by uid 89); 13 Jan 2015 19:30:01 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.1 required=5.0 tests=AWL, BAYES_00 autolearn=ham version=3.3.2 X-HELO: shards.monkeyblade.net Date: Tue, 13 Jan 2015 14:29:56 -0500 (EST) Message-Id: <20150113.142956.1435009499143534192.davem@davemloft.net> To: roland@hack.frob.com Cc: libc-alpha@sourceware.org Subject: [PATCH COMMITTED] was Re: conflict wrt. sigcontext definitions and use From: David Miller In-Reply-To: <20150113183328.068072C39DB@topped-with-meat.com> References: <20150112.133756.545927924497341987.davem@davemloft.net> <20150113183328.068072C39DB@topped-with-meat.com> Mime-Version: 1.0 From: Roland McGrath 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 + + * include/signal.h (__sigreturn): Guard with __USE_MISC. + 2015-01-13 Roland McGrath * 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,