mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-02 20:53:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'FireFox317-deadlock-windows-fix'

Browse Source 
Merges #7861
This commit is contained in:
Andrew Kelley 2021-01-24 12:22:51 -07:00
commit b56e916fa1
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/std/Progress.zig
View File

@ -103,8 +103,10 @@ pub const Node = struct {
}
parent.completeOne();
} else {
const held = self.context.update_lock.acquire();
defer held.release();
self.context.done = true;
self.context.refresh();
self.context.refreshWithHeldLock();
}
}

2
lib/std/os/windows/kernel32.zig
View File

@ -299,6 +299,6 @@ pub extern "kernel32" fn SleepConditionVariableSRW(
f: ULONG,
) callconv(WINAPI) BOOL;
pub extern "kernel32" fn TryAcquireSRWLockExclusive(s: *SRWLOCK) callconv(WINAPI) BOOL;
pub extern "kernel32" fn TryAcquireSRWLockExclusive(s: *SRWLOCK) callconv(WINAPI) BOOLEAN;
pub extern "kernel32" fn AcquireSRWLockExclusive(s: *SRWLOCK) callconv(WINAPI) void;
pub extern "kernel32" fn ReleaseSRWLockExclusive(s: *SRWLOCK) callconv(WINAPI) void;