This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch master updated. glibc-2.25-502-ged8cfb0


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  ed8cfb00c2fc291da1cece028bcdb05b2f4dd372 (commit)
      from  21f8859dd08fd231198eda4095061837d527b926 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=ed8cfb00c2fc291da1cece028bcdb05b2f4dd372

commit ed8cfb00c2fc291da1cece028bcdb05b2f4dd372
Author: Joseph Myers <joseph@codesourcery.com>
Date:   Mon Jun 19 12:18:46 2017 +0000

    Fix siginterrupt namespace (bug 21597).
    
    The siginterrupt function is XSI-shaded in POSIX.  glibc wrongly
    declares it in <signal.h> 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].

diff --git a/ChangeLog b/ChangeLog
index b8d9d58..9a0bdbb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2017-06-19  Joseph Myers  <joseph@codesourcery.com>
 
+	[BZ #21597]
+	* signal/signal.h (siginterrupt): Make declaration conditional on
+	[__USE_XOPEN_EXTENDED || __USE_MISC].
+
 	[BZ #21584]
 	* signal/signal.h: Make includes of <bits/sigstack.h> and
 	<bits/ss_flags.h> conditional on [__USE_XOPEN_EXTENDED ||
diff --git a/signal/signal.h b/signal/signal.h
index 8dfe849..ddb79c7 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 <stddef.h>
 
-/* 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 <bits/types/stack_t.h>
 # 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 <bits/sigstack.h>
 # include <bits/ss_flags.h>
 

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog       |    4 ++++
 signal/signal.h |   10 +++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]