public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc] y2038: include: Move struct __timeval64 definition to a separate file
@ 2020-05-05 22:57 Lukasz Majewski
0 siblings, 0 replies; only message in thread
From: Lukasz Majewski @ 2020-05-05 22:57 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=a308615f7c067371df8bd96cb233cd0574537863
commit a308615f7c067371df8bd96cb233cd0574537863
Author: Lukasz Majewski <lukma@denx.de>
Date: Tue Apr 21 19:01:56 2020 +0200
y2038: include: Move struct __timeval64 definition to a separate file
The struct __timeval64's definition has been moved from ./include/time.h to
./include/struct___timeval64.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.
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diff:
---
include/struct___timeval64.h | 17 +++++++++++++++++
include/time.h | 15 +--------------
2 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/include/struct___timeval64.h b/include/struct___timeval64.h
new file mode 100644
index 0000000000..05cf2f26fc
--- /dev/null
+++ b/include/struct___timeval64.h
@@ -0,0 +1,17 @@
+#ifndef _STRUCT_TIMEVAL64_H
+#define _STRUCT_TIMEVAL64_H
+
+#if __TIMESIZE == 64
+# define __timeval64 timeval
+#else
+/* The glibc Y2038-proof struct __timeval64 structure for a time value.
+ This structure is NOT supposed to be passed to the Linux kernel.
+ Instead, it shall be converted to struct __timespec64 and time shall
+ be [sg]et via clock_[sg]ettime (which are now Y2038 safe). */
+struct __timeval64
+{
+ __time64_t tv_sec; /* Seconds */
+ __suseconds64_t tv_usec; /* Microseconds */
+};
+#endif
+#endif /* _STRUCT_TIMEVAL64_H */
diff --git a/include/time.h b/include/time.h
index 1c103a4cb2..fe4da9ca10 100644
--- a/include/time.h
+++ b/include/time.h
@@ -4,6 +4,7 @@
#ifndef _ISOMAC
# include <bits/types/struct_timeval.h>
# include <struct___timespec64.h>
+# include <struct___timeval64.h>
# include <bits/types/locale_t.h>
# include <stdbool.h>
# include <time/mktime-internal.h>
@@ -73,20 +74,6 @@ struct __itimerspec64
};
#endif
-#if __TIMESIZE == 64
-# define __timeval64 timeval
-#else
-/* The glibc Y2038-proof struct __timeval64 structure for a time value.
- This structure is NOT supposed to be passed to the Linux kernel.
- Instead, it shall be converted to struct __timespec64 and time shall
- be [sg]et via clock_[sg]ettime (which are now Y2038 safe). */
-struct __timeval64
-{
- __time64_t tv_sec; /* Seconds */
- __suseconds64_t tv_usec; /* Microseconds */
-};
-#endif
-
#if __TIMESIZE == 64
# define __utimbuf64 utimbuf
# define __itimerval64 itimerval
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-05-05 22:57 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-05 22:57 [glibc] y2038: include: Move struct __timeval64 definition to a separate file Lukasz Majewski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).