| author |  Andrew Kelley <andrew@ziglang.org> 2019-10-30 12:49:37-04:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2019-10-30 12:49:37-04:00 |
| log | 24b3da871d7ab45d373c7ad05b30a1b96b41be50 |
| tree | 9d2ca119bb93ef07a6b09854c5526d47553bda06 |
| parent | f5ff36271bce54eaec6f20cdff4fa4efb833c0d4 |
| signature |  Commit is signed but in an unrecognized format. |
fix regressions
2 files changed, 3 insertions(+), 3 deletions(-)
lib/std/net/test.zig+1-1
| ... | ... | @@ -37,7 +37,7 @@ test "ip4s" { |
| 37 | 37 | "1.2.3.4", |
| 38 | 38 | "123.255.0.91", |
| 39 | 39 | }) |ip| { |
| 40 | var addr = Address.initIp4(parseIp4(ip) catch unreachable, 0); | |
| 40 | var addr = net.Address.initIp4(net.parseIp4(ip) catch unreachable, 0); | |
| 41 | 41 | var newIp = std.fmt.bufPrint(buffer[0..], "{}", addr) catch unreachable; |
| 42 | 42 | std.testing.expect(std.mem.eql(u8, ip, newIp[0 .. newIp.len - 2])); |
| 43 | 43 | } |
lib/std/os/linux.zig+2-2
| ... | ... | @@ -236,8 +236,8 @@ pub fn poll(fds: [*]pollfd, n: nfds_t, timeout: i32) usize { |
| 236 | 236 | n, |
| 237 | 237 | @ptrToInt(if (timeout >= 0) |
| 238 | 238 | ×pec{ |
| 239 | .tv_sec = timeout / 1000, | |
| 240 | .tv_nsec = (timeout % 1000) * 1000000, | |
| 239 | .tv_sec = @divTrunc(timeout, 1000), | |
| 240 | .tv_nsec = @rem(timeout, 1000) * 1000000, | |
| 241 | 241 | } |
| 242 | 242 | else |
| 243 | 243 | null), |