From patchwork Fri Mar 5 20:14:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 42310 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6FED4399F016; Fri, 5 Mar 2021 20:16:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6FED4399F016 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1614975360; bh=Tn++8IMq1jfClsgXizj0ItYOHILNuaqXc2VKy9liiQE=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=rcmTkmqPtR+Ud5zTyVoZBG3HmFUsxDtXDhfDs5wK4ARrjpw9xCOIuXg1O4Up4echh Tz69mDmB+jQbZ7aPia8QoDm4NWKfF6rZJHg3fUL7dVWz/DUPbyPQiG8EAkjoo0oVMH u310/lguT7/27lAbZn73fmVmFZsI5ZIIaL7WPzz0= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qk1-x72b.google.com (mail-qk1-x72b.google.com [IPv6:2607:f8b0:4864:20::72b]) by sourceware.org (Postfix) with ESMTPS id F2DFD399F003 for ; Fri, 5 Mar 2021 20:15:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org F2DFD399F003 Received: by mail-qk1-x72b.google.com with SMTP id z190so3255494qka.9 for ; Fri, 05 Mar 2021 12:15:57 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Tn++8IMq1jfClsgXizj0ItYOHILNuaqXc2VKy9liiQE=; b=cy5SGuZrypOD2WV6r8pcLBi1OF/zegYFFfNTAdbzAHWyqE+BIvBL4JCAVkS8G4xYNf XEctaWmm7FjtXNsg0Vz9e7/R4F0gLBY1o+1ndPiSexvOMetl7PXO6H2Uj+BrCQ0PHVUO LOFKBrAQzkMx5dZpwL4ZRjZzPjG95kXVOY4xK3muVzF/q9QIXqQS4xr/ST2NWKV5Ugg9 P1uygkaj9mczyvjRlU0hqiQyjviVZmTwErEQHYoeNqBoJOFOK8lHUYNWTCGkNbXH6ywj BYCcfDFOrcaxGKOPNBDvgSZcK8g8prts9ZzoWTDrlPd8/6ncQyOMSHf3cc2JpCABHsv2 k90w== X-Gm-Message-State: AOAM533y2Purr9unMxUlgW+H3Bnf2IbW6bodWB5rlMxkGaqnIUhGXLGK T9JR1I1x33GSxR+3xkjD+vn1byB+DAX3UQ== X-Google-Smtp-Source: ABdhPJwTkSnBUCApgVj57tpOuXsaNCvi32eKgfpwWeIChKY1SJE/xWqgQGEpjukgUftQhLKqbgatyA== X-Received: by 2002:a05:620a:91b:: with SMTP id v27mr11047680qkv.201.1614975357483; Fri, 05 Mar 2021 12:15:57 -0800 (PST) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id c5sm2526145qkl.21.2021.03.05.12.15.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 12:15:57 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH 29/52] y2038: Add __USE_TIME_BITS64 support for struct timespec Date: Fri, 5 Mar 2021 17:14:55 -0300 Message-Id: <20210305201518.798584-30-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210305201518.798584-1-adhemerval.zanella@linaro.org> References: <20210305201518.798584-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-13.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" The __USE_TIME_BITS64 is not defined internally yet. --- time/bits/types/struct_timespec.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/time/bits/types/struct_timespec.h b/time/bits/types/struct_timespec.h index d11c69cfd3..4fe47a0d25 100644 --- a/time/bits/types/struct_timespec.h +++ b/time/bits/types/struct_timespec.h @@ -1,18 +1,22 @@ -/* NB: Include guard matches what uses. */ -#ifndef _STRUCT_TIMESPEC -#define _STRUCT_TIMESPEC 1 +#ifndef __struct_timespec_defined +#define __struct_timespec_defined 1 #include #include +#include /* POSIX.1b structure for a time value. This is like a `struct timeval' but has nanoseconds instead of microseconds. */ struct timespec { +#ifdef __USE_TIME_BITS64 + __time64_t tv_sec; /* Seconds. */ +#else __time_t tv_sec; /* Seconds. */ +#endif #if __WORDSIZE == 64 \ || (defined __SYSCALL_WORDSIZE && __SYSCALL_WORDSIZE == 64) \ - || __TIMESIZE == 32 + || (__TIMESIZE == 32 && !defined __USE_TIME_BITS64) __syscall_slong_t tv_nsec; /* Nanoseconds. */ #else # if __BYTE_ORDER == __BIG_ENDIAN