Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 14 Feb 2023 22:34:05 GMT
From:      Ed Maste <emaste@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 26b9c45c8f65 - releng/13.2 - ssh: fix SIZEOF_TIME_T #define on i386
Message-ID:  <202302142234.31EMY5vI046574@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch releng/13.2 has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=26b9c45c8f65dbd30bc41f1928db8cd66bb154bb

commit 26b9c45c8f65dbd30bc41f1928db8cd66bb154bb
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2023-02-08 18:31:44 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2023-02-14 22:33:56 +0000

    ssh: fix SIZEOF_TIME_T #define on i386
    
    Reported by:    imp
    Reviewed by:    imp
    Approved by:    re (cperciva)
    Sponsored by:   The FreeBSD Foundation
    Differential Revision:  https://reviews.freebsd.org/D38443
    
    (cherry picked from commit 1aa9a35f6361cc898e2323e1f2823771eb4161da)
    (cherry picked from commit 59ab4b95129dd5d64a52e0822b4fb5621bf65e9c)
---
 crypto/openssh/config.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/crypto/openssh/config.h b/crypto/openssh/config.h
index 55ad3be64e69..e267ba122719 100644
--- a/crypto/openssh/config.h
+++ b/crypto/openssh/config.h
@@ -1941,7 +1941,11 @@
 #define SIZEOF_SHORT_INT 2
 
 /* The size of `time_t', as computed by sizeof. */
+#ifdef __i386__
+#define SIZEOF_TIME_T 4
+#else
 #define SIZEOF_TIME_T 8
+#endif
 
 /* Define as const if snprintf() can declare const char *fmt */
 #define SNPRINTF_CONST const



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302142234.31EMY5vI046574>