From 4e0847afce95bce2737504cf6205eeaf9621e76a Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Thu, 28 Jun 2018 13:21:20 +0200 Subject: [PATCH] Use _STRUCT_TIMESPEC as guard in [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 . Use _STRUCT_TIMESPEC as the header file inclusion guard, which is already checked in the kernel header, to support including and in the same translation unit. (cherry picked from commit c1c2848b572ea7f92b7fa81dd5b1b9ef7c69b83b) --- ChangeLog | 6 ++++++ NEWS | 1 + time/bits/types/struct_timespec.h | 5 +++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6fba508ae14..371ae547c4d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2018-06-28 Florian Weimer + + [BZ #23349] + * time/bits/types/struct_timespec.h: Change header inclusion guard to + _STRUCT_TIMESPEC. + 2018-05-24 Gabriel F. T. Gomes [BZ #23171] diff --git a/NEWS b/NEWS index 2dab66e8511..f6e33734c8e 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 Version 2.27 diff --git a/time/bits/types/struct_timespec.h b/time/bits/types/struct_timespec.h index 644db9fdb62..5b77c52b4f0 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 uses. */ +#ifndef _STRUCT_TIMESPEC +#define _STRUCT_TIMESPEC 1 #include -- 2.47.2