From 7b7ba51642c832c77ec2668491843be3b0114124 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <andrew@ziglang.org>
Date: Wed, 30 Oct 2019 20:57:20 -0400
Subject: [PATCH] fix os.sockaddr being a union instead of a struct

---
 lib/std/net/test.zig        | 2 +-
 lib/std/os/bits/darwin.zig  | 2 +-
 lib/std/os/bits/freebsd.zig | 2 +-
 lib/std/os/bits/linux.zig   | 2 +-
 lib/std/os/bits/netbsd.zig  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/std/net/test.zig b/lib/std/net/test.zig
index 8b3d0efef7..54fd40f23e 100644
--- a/lib/std/net/test.zig
+++ b/lib/std/net/test.zig
@@ -4,7 +4,7 @@ const mem = std.mem;
 const testing = std.testing;
 
 test "parse and render IPv6 addresses" {
-    const addr = net.IpAddress.parseIp6("FF01:0:0:0:0:0:0:FB", 80);
+    const addr = try net.IpAddress.parseIp6("FF01:0:0:0:0:0:0:FB", 80);
     var buf: [100]u8 = undefined;
     const printed = try std.fmt.bufPrint(&buf, "{}", addr);
     std.testing.expect(mem.eql(u8, "[ff01::fb]:80", printed));
diff --git a/lib/std/os/bits/darwin.zig b/lib/std/os/bits/darwin.zig
index 6702a7d36d..863489f39a 100644
--- a/lib/std/os/bits/darwin.zig
+++ b/lib/std/os/bits/darwin.zig
@@ -8,7 +8,7 @@ pub const pid_t = c_int;
 pub const in_port_t = u16;
 pub const sa_family_t = u8;
 pub const socklen_t = u32;
-pub const sockaddr = extern union {
+pub const sockaddr = extern struct {
     len: u8,
     family: sa_family_t,
     data: [14]u8,
diff --git a/lib/std/os/bits/freebsd.zig b/lib/std/os/bits/freebsd.zig
index 77a94a4678..0e86755c74 100644
--- a/lib/std/os/bits/freebsd.zig
+++ b/lib/std/os/bits/freebsd.zig
@@ -137,7 +137,7 @@ pub const dirent = extern struct {
 pub const in_port_t = u16;
 pub const sa_family_t = u16;
 
-pub const sockaddr = extern union {
+pub const sockaddr = extern struct {
     /// total length
     len: u8,
 
diff --git a/lib/std/os/bits/linux.zig b/lib/std/os/bits/linux.zig
index 9329a00fef..b0c72935b8 100644
--- a/lib/std/os/bits/linux.zig
+++ b/lib/std/os/bits/linux.zig
@@ -809,7 +809,7 @@ pub const in_port_t = u16;
 pub const sa_family_t = u16;
 pub const socklen_t = u32;
 
-pub const sockaddr = extern union {
+pub const sockaddr = extern struct {
     family: sa_family_t,
     data: [14]u8,
 };
diff --git a/lib/std/os/bits/netbsd.zig b/lib/std/os/bits/netbsd.zig
index 2712ab4c64..107dd0b44d 100644
--- a/lib/std/os/bits/netbsd.zig
+++ b/lib/std/os/bits/netbsd.zig
@@ -133,7 +133,7 @@ pub const dirent = extern struct {
 pub const in_port_t = u16;
 pub const sa_family_t = u8;
 
-pub const sockaddr = extern union {
+pub const sockaddr = extern struct {
     /// total length
     len: u8,