| author |  emekoi <emekankurumeh@outlook.com> 2018-11-27 01:39:37-06:00 |
| committer | emekoi <emekankurumeh@outlook.com> 2019-01-11 09:56:35-06:00 |
| log | 93851270526e71407b4225a23daa66214a4010f9 |
| tree | 3e2997207144c14d96c25b36a23240182b6efc58 |
| parent | bb31695fbfbf7c808dc3fd8c3cfc0b654ed15e5e |
changed pointer types
2 files changed, 6 insertions(+), 5 deletions(-)
std
- mutex.zig
os
windows
std/mutex.zig+4-3
| ... | ... | @@ -82,9 +82,9 @@ pub const Mutex = switch(builtin.os) { |
| 82 | 82 | }; |
| 83 | 83 | } |
| 84 | 84 | |
| 85 | extern fn initCriticalSection(InitOnce: *windows.PINIT_ONCE, Parameter: ?windows.PVOID, Context: ?*windows.PVOID) windows.BOOL { | |
| 85 | extern fn initCriticalSection(InitOnce: *windows.PINIT_ONCE, Parameter: ?windows.PVOID, Context: ?windows.PVOID) windows.BOOL { | |
| 86 | 86 | if (Context) |ctx| { |
| 87 | var mutex = @ptrCast(*?windows.CRITICAL_SECTION, ctx); | |
| 87 | var mutex = @ptrCast(*?windows.CRITICAL_SECTION, @alignCast(8, ctx)); | |
| 88 | 88 | if (mutex.* == null) { |
| 89 | 89 | var lock: windows.CRITICAL_SECTION = undefined; |
| 90 | 90 | windows.InitializeCriticalSection(&lock); |
| ... | ... | @@ -105,7 +105,8 @@ pub const Mutex = switch(builtin.os) { |
| 105 | 105 | if (self.lock) |*lock| { |
| 106 | 106 | windows.EnterCriticalSection(lock); |
| 107 | 107 | } else { |
| 108 | if (windows.InitOnceExecuteOnce(&self.init_once, initCriticalSection, null, @ptrCast(?*windows.PVOID, self)) == windows.TRUE) { | |
| 108 | var mutex = @ptrCast(?windows.PVOID, self); | |
| 109 | if (windows.InitOnceExecuteOnce(&self.init_once, initCriticalSection, null, mutex) == windows.TRUE) { | |
| 109 | 110 | windows.EnterCriticalSection(&self.lock.?); |
| 110 | 111 | } else { |
| 111 | 112 | @panic("unable to initialize Mutex"); |
std/os/windows/kernel32.zig+2-2
| ... | ... | @@ -254,9 +254,9 @@ pub const RTL_CRITICAL_SECTION = extern struct { |
| 254 | 254 | |
| 255 | 255 | pub const CRITICAL_SECTION = RTL_CRITICAL_SECTION; |
| 256 | 256 | |
| 257 | pub extern "kernel32" stdcallcc fn InitOnceExecuteOnce(InitOnce: *PINIT_ONCE, InitFn: PINIT_ONCE_FN, Context: ?PVOID, Parameter: ?*LPVOID) BOOL; | |
| 257 | pub extern "kernel32" stdcallcc fn InitOnceExecuteOnce(InitOnce: *PINIT_ONCE, InitFn: PINIT_ONCE_FN, Context: ?PVOID, Parameter: ?LPVOID) BOOL; | |
| 258 | 258 | |
| 259 | pub const PINIT_ONCE_FN = ?extern fn(InitOnce: *PINIT_ONCE, Parameter: ?PVOID, Context: ?*PVOID) BOOL; | |
| 259 | pub const PINIT_ONCE_FN = ?extern fn(InitOnce: *PINIT_ONCE, Parameter: ?PVOID, Context: ?PVOID) BOOL; | |
| 260 | 260 | |
| 261 | 261 | pub const RTL_RUN_ONCE = extern struct { |
| 262 | 262 | Ptr: PVOID, |