| author |  Andrew Kelley <andrew@ziglang.org> 2019-10-30 20:57:20-04:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2019-10-30 20:57:20-04:00 |
| log | 7b7ba51642c832c77ec2668491843be3b0114124 |
| tree | 83ec3758b3cec6dc161aa9a78d9887f6406c9c1c |
| parent | d7f15aa2cbead42516fe1339cd5395c3221216f4 |
| signature |  Commit is signed but in an unrecognized format. |
fix os.sockaddr being a union instead of a struct
5 files changed, 5 insertions(+), 5 deletions(-)
lib- std
- net
lib/std/net/test.zig+1-1
| ... | @@ -4,7 +4,7 @@ const mem = std.mem; | ... | @@ -4,7 +4,7 @@ const mem = std.mem; |
| 4 | const testing = std.testing; | 4 | const testing = std.testing; |
| 5 | 5 | ||
| 6 | test "parse and render IPv6 addresses" { | 6 | test "parse and render IPv6 addresses" { |
| 7 | const addr = net.IpAddress.parseIp6("FF01:0:0:0:0:0:0:FB", 80); | 7 | const addr = try net.IpAddress.parseIp6("FF01:0:0:0:0:0:0:FB", 80); |
| 8 | var buf: [100]u8 = undefined; | 8 | var buf: [100]u8 = undefined; |
| 9 | const printed = try std.fmt.bufPrint(&buf, "{}", addr); | 9 | const printed = try std.fmt.bufPrint(&buf, "{}", addr); |
| 10 | std.testing.expect(mem.eql(u8, "[ff01::fb]:80", printed)); | 10 | std.testing.expect(mem.eql(u8, "[ff01::fb]:80", printed)); |
lib/std/os/bits/darwin.zig+1-1
| ... | @@ -8,7 +8,7 @@ pub const pid_t = c_int; | ... | @@ -8,7 +8,7 @@ pub const pid_t = c_int; |
| 8 | pub const in_port_t = u16; | 8 | pub const in_port_t = u16; |
| 9 | pub const sa_family_t = u8; | 9 | pub const sa_family_t = u8; |
| 10 | pub const socklen_t = u32; | 10 | pub const socklen_t = u32; |
| 11 | pub const sockaddr = extern union { | 11 | pub const sockaddr = extern struct { |
| 12 | len: u8, | 12 | len: u8, |
| 13 | family: sa_family_t, | 13 | family: sa_family_t, |
| 14 | data: [14]u8, | 14 | data: [14]u8, |
lib/std/os/bits/freebsd.zig+1-1
| ... | @@ -137,7 +137,7 @@ pub const dirent = extern struct { | ... | @@ -137,7 +137,7 @@ pub const dirent = extern struct { |
| 137 | pub const in_port_t = u16; | 137 | pub const in_port_t = u16; |
| 138 | pub const sa_family_t = u16; | 138 | pub const sa_family_t = u16; |
| 139 | 139 | ||
| 140 | pub const sockaddr = extern union { | 140 | pub const sockaddr = extern struct { |
| 141 | /// total length | 141 | /// total length |
| 142 | len: u8, | 142 | len: u8, |
| 143 | 143 |
lib/std/os/bits/linux.zig+1-1
| ... | @@ -809,7 +809,7 @@ pub const in_port_t = u16; | ... | @@ -809,7 +809,7 @@ pub const in_port_t = u16; |
| 809 | pub const sa_family_t = u16; | 809 | pub const sa_family_t = u16; |
| 810 | pub const socklen_t = u32; | 810 | pub const socklen_t = u32; |
| 811 | 811 | ||
| 812 | pub const sockaddr = extern union { | 812 | pub const sockaddr = extern struct { |
| 813 | family: sa_family_t, | 813 | family: sa_family_t, |
| 814 | data: [14]u8, | 814 | data: [14]u8, |
| 815 | }; | 815 | }; |
lib/std/os/bits/netbsd.zig+1-1
| ... | @@ -133,7 +133,7 @@ pub const dirent = extern struct { | ... | @@ -133,7 +133,7 @@ pub const dirent = extern struct { |
| 133 | pub const in_port_t = u16; | 133 | pub const in_port_t = u16; |
| 134 | pub const sa_family_t = u8; | 134 | pub const sa_family_t = u8; |
| 135 | 135 | ||
| 136 | pub const sockaddr = extern union { | 136 | pub const sockaddr = extern struct { |
| 137 | /// total length | 137 | /// total length |
| 138 | len: u8, | 138 | len: u8, |
| 139 | 139 |