29 lines
1.0 KiB
Diff
29 lines
1.0 KiB
Diff
commit 371fd753b278a5ca5e8f3233f585f6b2826b0a3b
|
|
Author: Florian Weimer <fweimer@redhat.com>
|
|
Date: Thu Jun 21 08:18:15 2018 +0200
|
|
|
|
time: Define _STRUCT_TIMESPEC in <bits/types/struct_timespec.h>
|
|
|
|
After commit d76d3703551a362b472c866b5b6089f66f8daa8e ("Fix missing
|
|
timespec definition for sys/stat.h (BZ #21371)"), sanitizer builds start
|
|
to fail due to a conflicting definition of struct timespec in
|
|
<linux/time.h>. Define _STRUCT_TIMESPEC, which is already checked in
|
|
the kernel header, to support including <linux/time.h> after
|
|
<sys/stat.h>.
|
|
|
|
diff --git a/time/bits/types/struct_timespec.h b/time/bits/types/struct_timespec.h
|
|
index 644db9fdb6206291..bde7e2826d839e77 100644
|
|
--- a/time/bits/types/struct_timespec.h
|
|
+++ b/time/bits/types/struct_timespec.h
|
|
@@ -1,6 +1,10 @@
|
|
#ifndef __timespec_defined
|
|
#define __timespec_defined 1
|
|
|
|
+#ifndef _STRUCT_TIMESPEC
|
|
+# define _STRUCT_TIMESPEC 1
|
|
+#endif
|
|
+
|
|
#include <bits/types.h>
|
|
|
|
/* POSIX.1b structure for a time value. This is like a `struct timeval' but
|