From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id EA7BF388700C; Thu, 30 Jul 2020 13:28:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EA7BF388700C Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc/azanella/y2038] login: Use 64-bit time on struct lastlog X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/azanella/y2038 X-Git-Oldrev: a3d096499f681a83cbda21a0c3861d298420d68b X-Git-Newrev: 18e937f4d69f1624835de02dd8c762a99b71b457 Message-Id: <20200730132814.EA7BF388700C@sourceware.org> Date: Thu, 30 Jul 2020 13:28:14 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Jul 2020 13:28:15 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=18e937f4d69f1624835de02dd8c762a99b71b457 commit 18e937f4d69f1624835de02dd8c762a99b71b457 Author: Adhemerval Zanella Date: Wed Jul 29 16:18:13 2020 -0300 login: Use 64-bit time on struct lastlog It is not used directly on any symbol, so there is no need to add compat ones. Diff: --- bits/types/struct_lastlog.h | 4 +-- sysdeps/unix/sysv/linux/s390/bits/struct_lastlog.h | 34 ---------------------- 2 files changed, 2 insertions(+), 36 deletions(-) diff --git a/bits/types/struct_lastlog.h b/bits/types/struct_lastlog.h index 122a44abd0..6882015d7c 100644 --- a/bits/types/struct_lastlog.h +++ b/bits/types/struct_lastlog.h @@ -24,8 +24,8 @@ previous logins. */ struct lastlog { -#if __WORDSIZE_TIME64_COMPAT32 - int32_t ll_time; +#if __TIMESIZE != 64 + int64_t ll_time; #else __time_t ll_time; #endif diff --git a/sysdeps/unix/sysv/linux/s390/bits/struct_lastlog.h b/sysdeps/unix/sysv/linux/s390/bits/struct_lastlog.h deleted file mode 100644 index 715e8f1b74..0000000000 --- a/sysdeps/unix/sysv/linux/s390/bits/struct_lastlog.h +++ /dev/null @@ -1,34 +0,0 @@ -/* The 'struct lastlog' type. - Copyright (C) 2020 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#ifndef _UTMP_H -# error "Never include directly; use instead." -#endif - -/* The structure describing an entry in the database of - previous logins. */ -struct lastlog - { -#if __WORDSIZE == 32 - int64_t ll_time; -#else - __time_t ll_time; -#endif - char ll_line[UT_LINESIZE]; - char ll_host[UT_HOSTSIZE]; - };