[prev in list] [next in list] [prev in thread] [next in thread] 

List:       glibc-cvs
Subject:    GNU C Library master sources branch release/2.27/master updated. glibc-2.27-65-g4e0847a
From:       fw () sourceware ! org
Date:       2018-06-28 11:39:56
Message-ID: 20180628113956.118437.qmail () sourceware ! org
[Download RAW message or body]

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, release/2.27/master has been updated
       via  4e0847afce95bce2737504cf6205eeaf9621e76a (commit)
      from  ffc56239787cdb5b0306baa8368923753f5891e6 (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=4e0847afce95bce2737504cf6205eeaf9621e76a

commit 4e0847afce95bce2737504cf6205eeaf9621e76a
Author: Florian Weimer <fweimer@redhat.com>
Date:   Thu Jun 28 13:21:20 2018 +0200

    Use _STRUCT_TIMESPEC as guard in <bits/types/struct_timespec.h> [BZ #23349]
    
    After commit d76d3703551a362b472c866b5b6089f66f8daa8e ("Fix missing
    timespec definition for sys/stat.h (BZ #21371)") in combination with
    kernel UAPI changes, GCC sanitizer builds start to fail due to a
    conflicting definition of struct timespec in <linux/time.h>.  Use
    _STRUCT_TIMESPEC as the header file inclusion guard, which is already
    checked in the kernel header, to support including <linux/time.h> and
    <sys/stat.h> in the same translation unit.
    
    (cherry picked from commit c1c2848b572ea7f92b7fa81dd5b1b9ef7c69b83b)

diff --git a/ChangeLog b/ChangeLog
index 6fba508..371ae54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-06-28  Florian Weimer  <fweimer@redhat.com>
+
+	[BZ #23349]
+	* time/bits/types/struct_timespec.h: Change header inclusion guard to
+	_STRUCT_TIMESPEC.
+
 2018-05-24  Gabriel F. T. Gomes  <gabriel@inconstante.eti.br>
 
 	[BZ #23171]
diff --git a/NEWS b/NEWS
index 2dab66e..f6e3373 100644
--- a/NEWS
+++ b/NEWS
@@ -80,6 +80,7 @@ The following bugs are resolved with this release:
   [23236] Harden function pointers in _IO_str_fields
   [23259] Unsubstituted ${ORIGIN} remains in DT_NEEDED for AT_SECURE
   [23264] libc: posix_spawnp wrongly executes ENOEXEC in non compat mode
+  [23349] Various glibc headers no longer compatible with <linux/time.h>
 
 
 Version 2.27
diff --git a/time/bits/types/struct_timespec.h b/time/bits/types/struct_timespec.h
index 644db9f..5b77c52 100644
--- a/time/bits/types/struct_timespec.h
+++ b/time/bits/types/struct_timespec.h
@@ -1,5 +1,6 @@
-#ifndef __timespec_defined
-#define __timespec_defined 1
+/* NB: Include guard matches what <linux/time.h> uses.  */
+#ifndef _STRUCT_TIMESPEC
+#define _STRUCT_TIMESPEC 1
 
 #include <bits/types.h>
 

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

Summary of changes:
 ChangeLog                         |    6 ++++++
 NEWS                              |    1 +
 time/bits/types/struct_timespec.h |    5 +++--
 3 files changed, 10 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources
[prev in list] [next in list] [prev in thread] [next in thread]