summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsebres <sebres@users.sourceforge.net>2024-04-17 15:17:36 (GMT)
committersebres <sebres@users.sourceforge.net>2024-04-17 15:17:36 (GMT)
commitf78e49764e59358677f00c3e2d964ff576a45664 (patch)
tree18a4c168096b345817f31faff2c8da2902db94ff
parent9663aab7c94b61f7e41141daf7e614808ab75e01 (diff)
parentdef527584228071c5ed89db69899100fa35440f0 (diff)
downloadtcl-f78e49764e59358677f00c3e2d964ff576a45664.zip
tcl-f78e49764e59358677f00c3e2d964ff576a45664.tar.gz
tcl-f78e49764e59358677f00c3e2d964ff576a45664.tar.bz2
merge point (with small amend, same type as in 9.0 header declared for Tcl_Time::sec)
-rw-r--r--generic/tclClock.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/generic/tclClock.c b/generic/tclClock.c
index fae2089..2ec7a37 100644
--- a/generic/tclClock.c
+++ b/generic/tclClock.c
@@ -4652,7 +4652,11 @@ ClockSafeCatchCmd(
typedef struct ClockTzStatic {
WCHAR *was; /* Previous value of TZ. */
+#if TCL_MAJOR_VERSION > 8
long long lastRefresh; /* Used for latency before next refresh. */
+#else
+ long lastRefresh; /* Used for latency before next refresh. */
+#endif
size_t epoch; /* Epoch, signals that TZ changed. */
size_t envEpoch; /* Last env epoch, for faster signaling,
* that TZ changed via TCL */