From 0f1db901980f9329b3c45c016eb467f083493060 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= <alex@alexrp.com>
Date: Sat, 3 Aug 2024 19:56:42 +0200
Subject: [PATCH] std.os.windows.tls: Slightly improve type safety.

---
 lib/std/os/windows/tls.zig | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/std/os/windows/tls.zig b/lib/std/os/windows/tls.zig
index e8735a2707501646dd04da8e841d4cfdf29798c1..658eff86816e24d7edd8e4009a481a71acea0820 100644
--- a/lib/std/os/windows/tls.zig
+++ b/lib/std/os/windows/tls.zig
@@ -1,11 +1,12 @@
 const std = @import("std");
 const builtin = @import("builtin");
+const windows = std.os.windows;
 
 export var _tls_index: u32 = std.os.windows.TLS_OUT_OF_INDEXES;
 export var _tls_start: ?*anyopaque linksection(".tls") = null;
 export var _tls_end: ?*anyopaque linksection(".tls$ZZZ") = null;
-export var __xl_a: std.os.windows.PIMAGE_TLS_CALLBACK linksection(".CRT$XLA") = null;
-export var __xl_z: std.os.windows.PIMAGE_TLS_CALLBACK linksection(".CRT$XLZ") = null;
+export var __xl_a: windows.PIMAGE_TLS_CALLBACK linksection(".CRT$XLA") = null;
+export var __xl_z: windows.PIMAGE_TLS_CALLBACK linksection(".CRT$XLZ") = null;
 
 comptime {
     if (builtin.target.cpu.arch == .x86 and builtin.zig_backend != .stage2_c) {
@@ -33,8 +34,8 @@ comptime {
 pub const IMAGE_TLS_DIRECTORY = extern struct {
     StartAddressOfRawData: *?*anyopaque,
     EndAddressOfRawData: *?*anyopaque,
-    AddressOfIndex: *anyopaque,
-    AddressOfCallBacks: *anyopaque,
+    AddressOfIndex: *u32,
+    AddressOfCallBacks: *windows.PIMAGE_TLS_CALLBACK,
     SizeOfZeroFill: u32,
     Characteristics: u32,
 };
@@ -42,7 +43,7 @@ export const _tls_used linksection(".rdata$T") = IMAGE_TLS_DIRECTORY{
     .StartAddressOfRawData = &_tls_start,
     .EndAddressOfRawData = &_tls_end,
     .AddressOfIndex = &_tls_index,
-    .AddressOfCallBacks = @as(*anyopaque, @ptrCast(&__xl_a)),
+    .AddressOfCallBacks = &__xl_a,
     .SizeOfZeroFill = 0,
     .Characteristics = 0,
 };
-- 
2.54.0