aboutsummaryrefslogtreecommitdiff
path: root/lib/std/os/linux.zig
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2020-10-29 15:10:29 -0400
committerGitHub <noreply@github.com>2020-10-29 15:10:29 -0400
commit3a0e8c2b45e57e75cedd052b00fd7ae46def8383 (patch)
treede7fc435f56bf6484aa40fa41a0f8a1b5890c1bf /lib/std/os/linux.zig
parent844eb932f4a253863d36e01a713724141c1f6361 (diff)
parent7f4667219339e92dc75e7dfd5f0078f229804567 (diff)
downloadzig-3a0e8c2b45e57e75cedd052b00fd7ae46def8383.tar.gz
zig-3a0e8c2b45e57e75cedd052b00fd7ae46def8383.zip
Merge pull request #6838 from LemonBoy/netstuff
std: Add basic smoke test for net functionality
Diffstat (limited to 'lib/std/os/linux.zig')
-rw-r--r--lib/std/os/linux.zig6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/std/os/linux.zig b/lib/std/os/linux.zig
index e38d9bc10d..6d05d3b920 100644
--- a/lib/std/os/linux.zig
+++ b/lib/std/os/linux.zig
@@ -1003,14 +1003,14 @@ pub fn socketpair(domain: i32, socket_type: i32, protocol: i32, fd: [2]i32) usiz
return syscall4(.socketpair, @intCast(usize, domain), @intCast(usize, socket_type), @intCast(usize, protocol), @ptrToInt(&fd[0]));
}
-pub fn accept(fd: i32, noalias addr: *sockaddr, noalias len: *socklen_t) usize {
+pub fn accept(fd: i32, noalias addr: ?*sockaddr, noalias len: ?*socklen_t) usize {
if (builtin.arch == .i386) {
return socketcall(SC_accept, &[4]usize{ fd, addr, len, 0 });
}
return accept4(fd, addr, len, 0);
}
-pub fn accept4(fd: i32, noalias addr: *sockaddr, noalias len: *socklen_t, flags: u32) usize {
+pub fn accept4(fd: i32, noalias addr: ?*sockaddr, noalias len: ?*socklen_t, flags: u32) usize {
if (builtin.arch == .i386) {
return socketcall(SC_accept4, &[4]usize{ @bitCast(usize, @as(isize, fd)), @ptrToInt(addr), @ptrToInt(len), flags });
}
@@ -1279,7 +1279,7 @@ pub fn prlimit(pid: pid_t, resource: rlimit_resource, new_limit: ?*const rlimit,
@bitCast(usize, @as(isize, pid)),
@bitCast(usize, @as(isize, @enumToInt(resource))),
@ptrToInt(new_limit),
- @ptrToInt(old_limit)
+ @ptrToInt(old_limit),
);
}