aboutsummaryrefslogtreecommitdiff
path: root/std/os/bits/linux.zig
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2019-06-09 19:44:01 -0400
committerAndrew Kelley <andrew@ziglang.org>2019-06-09 19:44:01 -0400
commit3a4b749c8a1124734c3202ec0d6f4f6566e7dc7e (patch)
treed02ca4c7ff46abf748fa175a68d13eccebb97a92 /std/os/bits/linux.zig
parent59fe13772f63838a84ac1786c0dc8361cd14b99d (diff)
parentb735764898412c5b9388fdf729c8ad8db43ddde5 (diff)
downloadzig-3a4b749c8a1124734c3202ec0d6f4f6566e7dc7e.tar.gz
zig-3a4b749c8a1124734c3202ec0d6f4f6566e7dc7e.zip
Merge remote-tracking branch 'origin/master' into copy-elision-3
Diffstat (limited to 'std/os/bits/linux.zig')
-rw-r--r--std/os/bits/linux.zig6
1 files changed, 3 insertions, 3 deletions
diff --git a/std/os/bits/linux.zig b/std/os/bits/linux.zig
index ff541077d9..8b323fa572 100644
--- a/std/os/bits/linux.zig
+++ b/std/os/bits/linux.zig
@@ -691,8 +691,8 @@ pub const winsize = extern struct {
pub const NSIG = 65;
pub const sigset_t = [128 / @sizeOf(usize)]usize;
-pub const all_mask = []u32{ 0xffffffff, 0xffffffff };
-pub const app_mask = []u32{ 0xfffffffc, 0x7fffffff };
+pub const all_mask = [_]u32{ 0xffffffff, 0xffffffff };
+pub const app_mask = [_]u32{ 0xfffffffc, 0x7fffffff };
pub const k_sigaction = extern struct {
handler: extern fn (i32) void,
@@ -711,7 +711,7 @@ pub const Sigaction = struct {
pub const SIG_ERR = @intToPtr(extern fn (i32) void, maxInt(usize));
pub const SIG_DFL = @intToPtr(extern fn (i32) void, 0);
pub const SIG_IGN = @intToPtr(extern fn (i32) void, 1);
-pub const empty_sigset = []usize{0} ** sigset_t.len;
+pub const empty_sigset = [_]usize{0} ** sigset_t.len;
pub const in_port_t = u16;
pub const sa_family_t = u16;