| ... | @@ -154,8 +154,8 @@ pub const LibCInstallation = struct { | ... | @@ -154,8 +154,8 @@ pub const LibCInstallation = struct { |
| 154 | c.ZigFindWindowsSdkError.None => { | 154 | c.ZigFindWindowsSdkError.None => { |
| 155 | windows_sdk = sdk; | 155 | windows_sdk = sdk; |
| 156 | | 156 | |
| 157 | if (sdk.msvc_lib_dir_ptr) |ptr| { | 157 | if (sdk.msvc_lib_dir_ptr != 0) { |
| 158 | self.msvc_lib_dir = try std.mem.dupe(loop.allocator, u8, ptr[0..sdk.msvc_lib_dir_len]); | 158 | self.msvc_lib_dir = try std.mem.dupe(loop.allocator, u8, sdk.msvc_lib_dir_ptr[0..sdk.msvc_lib_dir_len]); |
| 159 | } | 159 | } |
| 160 | try group.call(findNativeKernel32LibDir, self, loop, sdk); | 160 | try group.call(findNativeKernel32LibDir, self, loop, sdk); |
| 161 | try group.call(findNativeIncludeDirWindows, self, loop, sdk); | 161 | try group.call(findNativeIncludeDirWindows, self, loop, sdk); |
| ... | @@ -437,20 +437,20 @@ const Search = struct { | ... | @@ -437,20 +437,20 @@ const Search = struct { |
| 437 | | 437 | |
| 438 | fn fillSearch(search_buf: *[2]Search, sdk: *c.ZigWindowsSDK) []Search { | 438 | fn fillSearch(search_buf: *[2]Search, sdk: *c.ZigWindowsSDK) []Search { |
| 439 | var search_end: usize = 0; | 439 | var search_end: usize = 0; |
| 440 | if (sdk.path10_ptr) |path10_ptr| { | 440 | if (sdk.path10_ptr != 0) { |
| 441 | if (sdk.version10_ptr) |ver10_ptr| { | 441 | if (sdk.version10_ptr != 0) { |
| 442 | search_buf[search_end] = Search{ | 442 | search_buf[search_end] = Search{ |
| 443 | .path = path10_ptr[0..sdk.path10_len], | 443 | .path = sdk.path10_ptr[0..sdk.path10_len], |
| 444 | .version = ver10_ptr[0..sdk.version10_len], | 444 | .version = sdk.version10_ptr[0..sdk.version10_len], |
| 445 | }; | 445 | }; |
| 446 | search_end += 1; | 446 | search_end += 1; |
| 447 | } | 447 | } |
| 448 | } | 448 | } |
| 449 | if (sdk.path81_ptr) |path81_ptr| { | 449 | if (sdk.path81_ptr != 0) { |
| 450 | if (sdk.version81_ptr) |ver81_ptr| { | 450 | if (sdk.version81_ptr != 0) { |
| 451 | search_buf[search_end] = Search{ | 451 | search_buf[search_end] = Search{ |
| 452 | .path = path81_ptr[0..sdk.path81_len], | 452 | .path = sdk.path81_ptr[0..sdk.path81_len], |
| 453 | .version = ver81_ptr[0..sdk.version81_len], | 453 | .version = sdk.version81_ptr[0..sdk.version81_len], |
| 454 | }; | 454 | }; |
| 455 | search_end += 1; | 455 | search_end += 1; |
| 456 | } | 456 | } |
Andrew Kelley <andrew@ziglang.org> 2019-02-14 23:46:53-05:00
src-self-hosted