Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 08 May 2026 20:05:50 +0000
From:      Ryan Libby <rlibby@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 324d53c26b23 - main - sys/time: rework saturation ifdef to avoid direct arch ref
Message-ID:  <69fe421e.1e236.606f6a05@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by rlibby:

URL: https://cgit.FreeBSD.org/src/commit/?id=324d53c26b2399d9b44fdd08e9c5af650f4ec3ae

commit 324d53c26b2399d9b44fdd08e9c5af650f4ec3ae
Author:     Ryan Libby <rlibby@FreeBSD.org>
AuthorDate: 2026-05-08 19:37:24 +0000
Commit:     Ryan Libby <rlibby@FreeBSD.org>
CommitDate: 2026-05-08 19:37:24 +0000

    sys/time: rework saturation ifdef to avoid direct arch ref
    
    Suggested by:   kib
    Reviewed by:    imp, kib
    Differential Revision:  https://reviews.freebsd.org/D56401
---
 sys/sys/time.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/sys/time.h b/sys/sys/time.h
index 6f18d8bd844d..5255d3bc9c7e 100644
--- a/sys/sys/time.h
+++ b/sys/sys/time.h
@@ -355,7 +355,7 @@ tstosbt(struct timespec _ts)
 static __inline sbintime_t
 tstosbt_sat(struct timespec _ts)
 {
-#ifndef __i386__
+#if __SIZEOF_TIME_T > 4
 	if (_ts.tv_sec > SBT_MAX >> 32)
 		return (SBT_MAX);
 	if (_ts.tv_sec < -(SBT_MAX >> 32) - 1)
@@ -384,7 +384,7 @@ tvtosbt(struct timeval _tv)
 static __inline sbintime_t
 tvtosbt_sat(struct timeval _tv)
 {
-#ifndef __i386__
+#if __SIZEOF_TIME_T > 4
 	if (_tv.tv_sec > SBT_MAX >> 32)
 		return (SBT_MAX);
 	if (_tv.tv_sec < -(SBT_MAX >> 32) - 1)


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69fe421e.1e236.606f6a05>