Merge 8.7

jan.nijtmans · jan.nijtmans · commit 0a0c3d11d0c9 · 2024-04-17T15:37:29.000Z
diff --git a/generic/tclClock.c b/generic/tclClock.c
@@ -4699,7 +4699,7 @@ TzsetIfNecessary(void)
 	if (tz.was != NULL && tz.was != TZ_INIT_MARKER) {
 	    Tcl_Free(tz.was);
 	}
-	tz.was = (WCHAR *) Tcl_Alloc(sizeof(WCHAR) * (wcslen(tzNow) + 1));
+	tz.was = (WCHAR *)Tcl_Alloc(sizeof(WCHAR) * (wcslen(tzNow) + 1));
 	wcscpy(tz.was, tzNow);
 	epoch = ++tz.epoch;
     } else if (tzNow == NULL && tz.was != NULL) {

Original file line number	Diff line number	Diff line change
`@@ -4699,7 +4699,7 @@ TzsetIfNecessary(void)`
`4699`	`4699`	`if (tz.was != NULL && tz.was != TZ_INIT_MARKER) {`
`4700`	`4700`	`Tcl_Free(tz.was);`
`4701`	`4701`	`}`
`4702`		`- tz.was = (WCHAR ) Tcl_Alloc(sizeof(WCHAR) (wcslen(tzNow) + 1));`
	`4702`	`+ tz.was = (WCHAR )Tcl_Alloc(sizeof(WCHAR) (wcslen(tzNow) + 1));`
`4703`	`4703`	`wcscpy(tz.was, tzNow);`
`4704`	`4704`	`epoch = ++tz.epoch;`
`4705`	`4705`	`} else if (tzNow == NULL && tz.was != NULL) {`