From patchwork Mon Jun 7 20:35:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 43760 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 2A723388CC15 for ; Mon, 7 Jun 2021 20:43:37 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2A723388CC15 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1623098617; bh=gqB+BCcWS1tW7LvDU2FDD3palGM3nb12JwH6uqcc6yM=; 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=PLM04EuH6WkS/LR1BSXYMydZVEITBTtVeWpaZifwyOU6WHddQglkw1sTrhAPaLuaQ gd1UIUZDr/+s20tKyX1LI0xlVaypAIsj2kdwZw0EIjJHUjMunkqj6D7GvA8TuZYGtK HNWE+rQZ1DtbsTFm4WGAiSMkmhJThcYE450C/UJE= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qt1-x82f.google.com (mail-qt1-x82f.google.com [IPv6:2607:f8b0:4864:20::82f]) by sourceware.org (Postfix) with ESMTPS id 23EEC3938C0E for ; Mon, 7 Jun 2021 20:36:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 23EEC3938C0E Received: by mail-qt1-x82f.google.com with SMTP id t17so13615042qta.11 for ; Mon, 07 Jun 2021 13:36:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gqB+BCcWS1tW7LvDU2FDD3palGM3nb12JwH6uqcc6yM=; b=e2SVLDIwR9LYMckLUkhP3X6OZL2dYahYWH67yopxFkYP5mDg0OjKzVwLeqyJNCBgAd Fd0XRwB4Si7XRpSoPlFTHw+k+PgTLR5jGMgNxY0MkFZR6UoxNtUN5UflqOd/tjwfoHKk t3SouhK6Cvhj1ern9LnKftC4TEpUl9qi7kLaA2A4/7GNOp1WjzpWrdBqlRXTSZUK1C1X BEkXePhlm9SvyPA+rgiVvkh7Bh+AKsTEhed89zKLZeytA+eaufY9zvkE5D/MhgMpKK7h jZVEdkQf/Tpix91XmFQtm6lYb6NX+mwr7plpFy3Hg9XPYhiZ/b0OmoWGCFvJxzZuKq8/ ulug== X-Gm-Message-State: AOAM533wESxwbYCgmnEFq1dUiyXhbGsrRuagRPYS07J1BUxS8duF/UxS wpr88zh4eXW1dZlmTL0fIDF4pIE5uvJ4hQ== X-Google-Smtp-Source: ABdhPJzZ1X/up+GVdJgAUKkEdceC0SviLkRW55cfr+xNWvkyKzeDyt6LAyMcvR84prgnnkpZK/22WQ== X-Received: by 2002:ac8:714b:: with SMTP id h11mr18134863qtp.225.1623098193582; Mon, 07 Jun 2021 13:36:33 -0700 (PDT) Received: from birita.. ([177.194.59.218]) by smtp.googlemail.com with ESMTPSA id t196sm10422123qke.50.2021.06.07.13.36.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Jun 2021 13:36:33 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v3 09/24] y2038: Add __USE_TIME_BITS64 support for struct timespec Date: Mon, 7 Jun 2021 17:35:58 -0300 Message-Id: <20210607203613.282543-10-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210607203613.282543-1-adhemerval.zanella@linaro.org> References: <20210607203613.282543-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.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 Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" The __USE_TIME_BITS64 is not defined internally yet. Reviewed-by: Lukasz Majewski Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell --- 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