This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH v3 1/3] y2038: include: Move struct __timespec64 definition to a separate file
- From: Lukasz Majewski <lukma at denx dot de>
- To: Joseph Myers <joseph at codesourcery dot com>, Paul Eggert <eggert at cs dot ucla dot edu>, Adhemerval Zanella <adhemerval dot zanella at linaro dot org>, Andreas Schwab <schwab at suse dot de>
- Cc: Alistair Francis <alistair23 at gmail dot com>, Alistair Francis <alistair dot francis at wdc dot com>, GNU C Library <libc-alpha at sourceware dot org>, Siddhesh Poyarekar <siddhesh at gotplt dot org>, Florian Weimer <fweimer at redhat dot com>, Florian Weimer <fw at deneb dot enyo dot de>, Zack Weinberg <zackw at panix dot com>, Carlos O'Donell <carlos at redhat dot com>, Lukasz Majewski <lukma at denx dot de>
- Date: Wed, 4 Mar 2020 15:19:28 +0100
- Subject: [PATCH v3 1/3] y2038: include: Move struct __timespec64 definition to a separate file
The struct __timespec64's definition has been moved from ./include/time.h to
./include/bits/types/struct___timespec64.h.
This change would prevent from polluting other glibc namespaces (when
headers are modified to support 64 bit time on architectures with
__WORDSIZE==32).
Now it is possible to just include definition of this particular structure
when needed.
---
Changes for v3:
- Rebase to the newest glibc's - master
Changes for v2:
- New patch - as suggested by Andreas Schwab
---
include/bits/types/struct___timespec64.h | 26 ++++++++++++++++++++++++
include/time.h | 24 +---------------------
2 files changed, 27 insertions(+), 23 deletions(-)
create mode 100644 include/bits/types/struct___timespec64.h
diff --git a/include/bits/types/struct___timespec64.h b/include/bits/types/struct___timespec64.h
new file mode 100644
index 0000000000..0c60f144c8
--- /dev/null
+++ b/include/bits/types/struct___timespec64.h
@@ -0,0 +1,26 @@
+#ifndef _TIMESPEC64_H
+#define _TIMESPEC64_H 1
+# if __TIMESIZE == 64
+# define __timespec64 timespec
+# else
+# include <endian.h>
+/* The glibc Y2038-proof struct __timespec64 structure for a time value.
+ To keep things Posix-ish, we keep the nanoseconds field a 32-bit
+ signed long, but since the Linux field is a 64-bit signed int, we
+ pad our tv_nsec with a 32-bit unnamed bit-field padding.
+
+ As a general rule the Linux kernel is ignoring upper 32 bits of
+ tv_nsec field. */
+struct __timespec64
+{
+ __time64_t tv_sec; /* Seconds */
+# if BYTE_ORDER == BIG_ENDIAN
+ __int32_t :32; /* Padding */
+ __int32_t tv_nsec; /* Nanoseconds */
+# else
+ __int32_t tv_nsec; /* Nanoseconds */
+ __int32_t :32; /* Padding */
+# endif
+};
+# endif
+#endif
diff --git a/include/time.h b/include/time.h
index 7737be1f7d..69359f1121 100644
--- a/include/time.h
+++ b/include/time.h
@@ -3,10 +3,10 @@
#ifndef _ISOMAC
# include <bits/types/struct_timeval.h>
+# include <bits/types/struct___timespec64.h>
# include <bits/types/locale_t.h>
# include <stdbool.h>
# include <time/mktime-internal.h>
-# include <endian.h>
# include <time-clockid.h>
# include <sys/time.h>
@@ -60,28 +60,6 @@ extern void __tzset_parse_tz (const char *tz) attribute_hidden;
extern void __tz_compute (__time64_t timer, struct tm *tm, int use_localtime)
__THROW attribute_hidden;
-#if __TIMESIZE == 64
-# define __timespec64 timespec
-#else
-/* The glibc Y2038-proof struct __timespec64 structure for a time value.
- To keep things Posix-ish, we keep the nanoseconds field a 32-bit
- signed long, but since the Linux field is a 64-bit signed int, we
- pad our tv_nsec with a 32-bit unnamed bit-field padding.
-
- As a general rule the Linux kernel is ignoring upper 32 bits of
- tv_nsec field. */
-struct __timespec64
-{
- __time64_t tv_sec; /* Seconds */
-# if BYTE_ORDER == BIG_ENDIAN
- __int32_t :32; /* Padding */
- __int32_t tv_nsec; /* Nanoseconds */
-# else
- __int32_t tv_nsec; /* Nanoseconds */
- __int32_t :32; /* Padding */
-# endif
-};
-#endif
#if __TIMESIZE == 64
# define __itimerspec64 itimerspec
--
2.20.1