[glibc/azanella/y2038-work] y2038: Add __USE_TIME_BITS64 support for struct timespec

[glibc/azanella/y2038-work] y2038: Add __USE_TIME_BITS64 support for struct timespec

[Adhemerval Zanella]

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=4e1c9764e5180e7f54567b432e13a2b5db5d3228

commit 4e1c9764e5180e7f54567b432e13a2b5db5d3228
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date:   Wed Feb 17 16:19:45 2021 -0300

    y2038: Add __USE_TIME_BITS64 support for struct timespec
    
    The __USE_TIME_BITS64 is not defined internally yet.

Diff:
---
 time/bits/types/struct_timespec.h | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/time/bits/types/struct_timespec.h b/time/bits/types/struct_timespec.h
index d11c69cfd3..4fe47a0d25 100644
--- a/time/bits/types/struct_timespec.h
+++ b/time/bits/types/struct_timespec.h
@@ -1,18 +1,22 @@
-/* NB: Include guard matches what <linux/time.h> uses.  */
-#ifndef _STRUCT_TIMESPEC
-#define _STRUCT_TIMESPEC 1
+#ifndef __struct_timespec_defined
+#define __struct_timespec_defined 1
 
 #include <bits/types.h>
 #include <bits/endian.h>
+#include <bits/types/time_t.h>
 
 /* POSIX.1b structure for a time value.  This is like a `struct timeval' but
    has nanoseconds instead of microseconds.  */
 struct timespec
 {
+#ifdef __USE_TIME_BITS64
+  __time64_t tv_sec;		/* Seconds.  */
+#else
   __time_t tv_sec;		/* Seconds.  */
+#endif
 #if __WORDSIZE == 64 \
   || (defined __SYSCALL_WORDSIZE && __SYSCALL_WORDSIZE == 64) \
-  || __TIMESIZE == 32
+  || (__TIMESIZE == 32 && !defined __USE_TIME_BITS64)
   __syscall_slong_t tv_nsec;	/* Nanoseconds.  */
 #else
 # if __BYTE_ORDER == __BIG_ENDIAN