public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Lukasz Majewski <lukma@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc] y2038: include: Move struct __timespec64 definition to a separate file Date: Mon, 6 Apr 2020 21:06:18 +0000 (GMT) [thread overview] Message-ID: <20200406210618.0608F385BF83@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=390b5a4727924503095327087c5d5f7a369732ef commit 390b5a4727924503095327087c5d5f7a369732ef Author: Lukasz Majewski <lukma@denx.de> Date: Wed Feb 12 10:42:49 2020 +0100 y2038: include: Move struct __timespec64 definition to a separate file The struct __timespec64's definition has been moved from ./include/time.h to ./include/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. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> Diff: --- include/struct___timespec64.h | 27 +++++++++++++++++++++++++++ include/time.h | 24 +----------------------- 2 files changed, 28 insertions(+), 23 deletions(-) diff --git a/include/struct___timespec64.h b/include/struct___timespec64.h new file mode 100644 index 0000000000..9abb25c8f7 --- /dev/null +++ b/include/struct___timespec64.h @@ -0,0 +1,27 @@ +#ifndef _STRUCT_TIMESPEC64_H +#define _STRUCT_TIMESPEC64_H + +#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 /* _STRUCT_TIMESPEC64_H */ diff --git a/include/time.h b/include/time.h index 4522fe9c4f..1c103a4cb2 100644 --- a/include/time.h +++ b/include/time.h @@ -3,11 +3,11 @@ #ifndef _ISOMAC # include <bits/types/struct_timeval.h> +# include <struct___timespec64.h> # include <bits/types/locale_t.h> # include <stdbool.h> # include <time/mktime-internal.h> # include <sys/time.h> -# include <endian.h> # include <time-clockid.h> # include <sys/time.h> @@ -61,28 +61,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
reply other threads:[~2020-04-06 21:06 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200406210618.0608F385BF83@sourceware.org \ --to=lukma@sourceware.org \ --cc=glibc-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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).