zig

commit 99b19adeb31469cbc4a906f036bb4d70d8730916 (tree)
parent 71d7100aa830652490d3995bf4e1319f31b5e647
Author: Andrew Kelley <andrew@ziglang.org>
Date:   Thu, 14 Feb 2019 23:46:53 -0500

stage2: fix windows regressions

Diffstat:
M
src-self-hosted/libc_installation.zig
 | 
20
++++++++++----------

1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/src-self-hosted/libc_installation.zig b/src-self-hosted/libc_installation.zig
@@ -154,8 +154,8 @@ pub const LibCInstallation = struct {
                     c.ZigFindWindowsSdkError.None => {
                         windows_sdk = sdk;
 
-                        if (sdk.msvc_lib_dir_ptr) |ptr| {
-                            self.msvc_lib_dir = try std.mem.dupe(loop.allocator, u8, ptr[0..sdk.msvc_lib_dir_len]);
+                        if (sdk.msvc_lib_dir_ptr != 0) {
+                            self.msvc_lib_dir = try std.mem.dupe(loop.allocator, u8, sdk.msvc_lib_dir_ptr[0..sdk.msvc_lib_dir_len]);
                         }
                         try group.call(findNativeKernel32LibDir, self, loop, sdk);
                         try group.call(findNativeIncludeDirWindows, self, loop, sdk);
@@ -437,20 +437,20 @@ const Search = struct {
 
 fn fillSearch(search_buf: *[2]Search, sdk: *c.ZigWindowsSDK) []Search {
     var search_end: usize = 0;
-    if (sdk.path10_ptr) |path10_ptr| {
-        if (sdk.version10_ptr) |ver10_ptr| {
+    if (sdk.path10_ptr != 0) {
+        if (sdk.version10_ptr != 0) {
             search_buf[search_end] = Search{
-                .path = path10_ptr[0..sdk.path10_len],
-                .version = ver10_ptr[0..sdk.version10_len],
+                .path = sdk.path10_ptr[0..sdk.path10_len],
+                .version = sdk.version10_ptr[0..sdk.version10_len],
             };
             search_end += 1;
         }
     }
-    if (sdk.path81_ptr) |path81_ptr| {
-        if (sdk.version81_ptr) |ver81_ptr| {
+    if (sdk.path81_ptr != 0) {
+        if (sdk.version81_ptr != 0) {
             search_buf[search_end] = Search{
-                .path = path81_ptr[0..sdk.path81_len],
-                .version = ver81_ptr[0..sdk.version81_len],
+                .path = sdk.path81_ptr[0..sdk.path81_len],
+                .version = sdk.version81_ptr[0..sdk.version81_len],
             };
             search_end += 1;
         }