On Mon, Aug 10, 2026 at 09:53:51AM +0200, Joerg Dorchain wrote:
> 
> That patch is the following commit
> https://gitlab.com/gpsd/gpsd/-/commit/8f7a59f768a87d45f546643ec7ea0546be4e0dbf

https://gitlab.com/gpsd/gpsd/-/commit/8f7a59f768a87d45f546643ec7ea0546be4e0dbf.patch
gives a directly usable patch:


From 8f7a59f768a87d45f546643ec7ea0546be4e0dbf Mon Sep 17 00:00:00 2001
From: "Gary E. Miller" <[email protected]>
Date: Tue, 30 Jun 2026 20:32:13 -0700
Subject: [PATCH] inclide/ntpshm.h: Partially revert 42309b8f.

Armian uses 64 bit time_t on 32 bit kernel, but does not
set _TIME_BITS.
---
 include/ntpshm.h | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/include/ntpshm.h b/include/ntpshm.h
index c8d5128ad..1c118525d 100644
--- a/include/ntpshm.h
+++ b/include/ntpshm.h
@@ -1,5 +1,5 @@
 /*
- * This file is Copyright 2015 by the GPSD project
+ * This file is Copyright by the GPSD project
  * SPDX-License-Identifier: BSD-2-clause
  */
 
@@ -39,23 +39,11 @@ struct shmTime
                  *       clear valid
                  */
     volatile int count;
-#if defined(_TIME_BITS) && 64 == _TIME_BITS
-    /* libc default time_t is 32-bits, but we are using 64-bits.
-     * glibc 2.34 and later.
-     * Lower 31 bits, no sign bit, are here. */
-    unsigned clockTimeStampSec;
-#else
+    // time_t may be 32 or 64-bit, depending
     time_t clockTimeStampSec;
-#endif
     int clockTimeStampUSec;
-#if defined(_TIME_BITS) && 64 == _TIME_BITS
-    /* libc default time_t is 32-bits, but we are using 64-bits.
-     * glibc 2.34 and later.
-     * Lower 31 bits, no sign bit, are here. */
-    unsigned receiveTimeStampSec;
-#else
+    // time_t may be 32 or 64-bit, depending
     time_t receiveTimeStampSec;
-#endif
     int receiveTimeStampUSec;
     int leap;                   // not leapsecond offset, a notification code
     int precision;              // log(2) of source jitter
-- 
GitLab


Attachment: signature.asc
Description: PGP signature

Reply via email to