From ed8cfb00c2fc291da1cece028bcdb05b2f4dd372 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Mon, 19 Jun 2017 12:18:46 +0000 Subject: Fix siginterrupt namespace (bug 21597). The siginterrupt function is XSI-shaded in POSIX. glibc wrongly declares it in for non-XSI POSIX.1:2008. This patch fixes the conditionals (moving it into the __USE_XOPEN_EXTENDED || __USE_MISC block as the minimum conservative change, although it's not clear this obsolescent function should be declared by default). Tested for x86_64. [BZ #21597] * signal/signal.h (siginterrupt): Make declaration conditional on [__USE_XOPEN_EXTENDED || __USE_MISC]. --- signal/signal.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'signal') diff --git a/signal/signal.h b/signal/signal.h index 8dfe849890..ddb79c7d98 100644 --- a/signal/signal.h +++ b/signal/signal.h @@ -296,11 +296,6 @@ extern int sigreturn (struct sigcontext *__scp) __THROW; # define __need_size_t # include -/* If INTERRUPT is nonzero, make signal SIG interrupt system calls - (causing them to fail with EINTR); if INTERRUPT is zero, make system - calls be restarted after signal SIG. */ -extern int siginterrupt (int __sig, int __interrupt) __THROW; - # include # if defined __USE_XOPEN || defined __USE_XOPEN2K8 /* This will define `ucontext_t' and `mcontext_t'. */ @@ -309,6 +304,11 @@ extern int siginterrupt (int __sig, int __interrupt) __THROW; #endif /* Use POSIX.1-2008 or X/Open Unix. */ #if defined __USE_XOPEN_EXTENDED || defined __USE_MISC +/* If INTERRUPT is nonzero, make signal SIG interrupt system calls + (causing them to fail with EINTR); if INTERRUPT is zero, make system + calls be restarted after signal SIG. */ +extern int siginterrupt (int __sig, int __interrupt) __THROW; + # include # include -- cgit 1.4.1