Merge 8.6

2 files changed, 5 insertions, 5 deletions

diff --git a/generic/tclClock.c b/generic/tclClock.c
index 4f97cb9..15256e8 100644
--- a/generic/tclClock.c
+++ b/generic/tclClock.c
@@ -1695,7 +1695,7 @@ ThreadSafeLocalTime(
 
     struct tm *tmPtr = (struct tm *)Tcl_GetThreadData(&tmKey, sizeof(struct tm));
 #ifdef HAVE_LOCALTIME_R
-    localtime_r(timePtr, tmPtr);
+    tmPtr = localtime_r(timePtr, tmPtr);
 #else
     struct tm *sysTmPtr;
 
@@ -1705,7 +1705,7 @@ ThreadSafeLocalTime(
 	Tcl_MutexUnlock(&clockMutex);
 	return NULL;
     }
-    memcpy(tmPtr, localtime(timePtr), sizeof(struct tm));
+    memcpy(tmPtr, sysTmPtr, sizeof(struct tm));
     Tcl_MutexUnlock(&clockMutex);
 #endif
     return tmPtr;
diff --git a/tests/clock.test b/tests/clock.test
index 3f20607..7bcc002 100644
--- a/tests/clock.test
+++ b/tests/clock.test
@@ -18601,10 +18601,10 @@ test clock-7.10 {Julian Day, negative amount} {
     # add negative amounts to Julian day 0 instead
     set s0 [clock scan 0 -format %J -gmt true]
     set J0 [scan [clock format $s0 -format %J -gmt true] %lld]
-    set s0m1d [clock add $s0 -1 days]
-    set s0m24h [clock add $s0 -24 hours]
+    set s0m1d [clock add $s0 -1 days -timezone :UTC]
+    set s0m24h [clock add $s0 -24 hours -timezone :UTC]
     set J0m24h [scan [clock format $s0m24h -format %J -gmt true] %lld]
-    set s0m1s [clock add $s0 -1 seconds]
+    set s0m1s [clock add $s0 -1 seconds -timezone :UTC]
     set J0m1s [scan [clock format $s0m1s -format %J -gmt true] %lld]
     list $s0m1d $s0m24h $J0m24h $s0m1s $J0m1s $s0 $J0 \
 	[::tcl::mathop::== $s0m1d $s0m24h] [::tcl::mathop::== $J0m24h $J0m1s]