From patchwork Fri Feb 14 09:17:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 38060 Received: (qmail 32628 invoked by alias); 14 Feb 2020 09:17:52 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 32575 invoked by uid 89); 14 Feb 2020 09:17:48 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.5 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 spammy= X-HELO: mail-out.m-online.net From: Lukasz Majewski To: Joseph Myers , Paul Eggert , Adhemerval Zanella Cc: Alistair Francis , Alistair Francis , GNU C Library , Siddhesh Poyarekar , Florian Weimer , Florian Weimer , Zack Weinberg , Carlos O'Donell , Andreas Schwab , Vineet Gupta , Lukasz Majewski Subject: [PATCH v2 1/3] y2038: include: Move struct __timespec64 definition to a separate file Date: Fri, 14 Feb 2020 10:17:29 +0100 Message-Id: <20200214091731.14552-1-lukma@denx.de> MIME-Version: 1.0 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 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 +/* 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 bd0b74dbcc..5931f4854c 100644 --- a/include/time.h +++ b/include/time.h @@ -3,11 +3,11 @@ #ifndef _ISOMAC # include +# include # include # include # include