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 9c6a1b97bd50162610766a4dbeff24462a4c2c90..0981fcaf7166c365975cb5ca2bc61e5516e90d14 100644 (file)
--- 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 c3233232590a4894423eafceb54feb2f4d40c501..c34c6393eec550fc75f999d0f361a911a8563e83 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -142,6 +142,7 @@ The following bugs are resolved with this release:
   [23171] Fix parameter type in C++ version of iseqsig
   [23196] __mempcpy_avx512_no_vzeroupper mishandles large copies
   [23236] Harden function pointers in _IO_str_fields
+  [23349] Various glibc headers no longer compatible with <linux/time.h>
 \f
 Version 2.26
 

diff --git a/time/bits/types/struct_timespec.h b/time/bits/types/struct_timespec.h
index 644db9fdb62062915fba7d829f0447e1e8961077..5b77c52b4f005701b1b91ded0b4edbe3520b1eb1 100644 (file)
--- 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>