diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2024-08-07 01:12:11 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-07 01:12:11 -0700 |
| commit | 8184912a9895523d23d03aa9bdcf607a56122a20 (patch) | |
| tree | f6f1d8382aa05ccb48826a30ba5ed518b7d8b16d /lib/std/start.zig | |
| parent | c0681d6b6e74bd70228bb79c6bf719da5a5fe444 (diff) | |
| parent | cb1fffb29eae6eafd46c87d3950911f496288ab2 (diff) | |
| download | zig-8184912a9895523d23d03aa9bdcf607a56122a20.tar.gz zig-8184912a9895523d23d03aa9bdcf607a56122a20.zip | |
Merge pull request #20925 from alexrp/windows-tls
`std`: Some Windows TLS cleanup and fixes
Diffstat (limited to 'lib/std/start.zig')
| -rw-r--r-- | lib/std/start.zig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/std/start.zig b/lib/std/start.zig index 2a072832bb..ca6a5416eb 100644 --- a/lib/std/start.zig +++ b/lib/std/start.zig @@ -176,7 +176,7 @@ fn _DllMainCRTStartup( lpReserved: std.os.windows.LPVOID, ) callconv(std.os.windows.WINAPI) std.os.windows.BOOL { if (!builtin.single_threaded and !builtin.link_libc) { - _ = @import("start_windows_tls.zig"); + _ = @import("os/windows/tls.zig"); } if (@hasDecl(root, "DllMain")) { @@ -434,7 +434,7 @@ fn _start() callconv(.Naked) noreturn { fn WinStartup() callconv(std.os.windows.WINAPI) noreturn { @setAlignStack(16); if (!builtin.single_threaded and !builtin.link_libc) { - _ = @import("start_windows_tls.zig"); + _ = @import("os/windows/tls.zig"); } std.debug.maybeEnableSegfaultHandler(); @@ -445,7 +445,7 @@ fn WinStartup() callconv(std.os.windows.WINAPI) noreturn { fn wWinMainCRTStartup() callconv(std.os.windows.WINAPI) noreturn { @setAlignStack(16); if (!builtin.single_threaded and !builtin.link_libc) { - _ = @import("start_windows_tls.zig"); + _ = @import("os/windows/tls.zig"); } std.debug.maybeEnableSegfaultHandler(); |