Skip to content

Commit

Permalink
Auto merge of #1985 - dvc94ch:nlmsghdr-musl-aarch64, r=JohnTitor
Browse files Browse the repository at this point in the history
Followup to #1649.

When adding `nlmsghdr` for `musl` targets the `aarch64` arch was singled out, not getting the definition. This remedies the problem so that `if-watch` compiles on `aarch64-unknown-linux-musl`.

- [0] https://github.com/dvc94ch/if-watch/issues/3
  • Loading branch information
bors committed Dec 3, 2020
2 parents d7149f0 + 53a8be9 commit 570d6b0
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 90 deletions.
18 changes: 0 additions & 18 deletions src/unix/linux_like/linux/musl/b32/arm/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -150,24 +150,6 @@ s! {
pub f_namemax: ::c_ulong,
__f_spare: [::c_int; 6],
}

pub struct nlmsghdr {
pub nlmsg_len: u32,
pub nlmsg_type: u16,
pub nlmsg_flags: u16,
pub nlmsg_seq: u32,
pub nlmsg_pid: u32,
}

pub struct nlmsgerr {
pub error: ::c_int,
pub msg: nlmsghdr,
}

pub struct nlattr {
pub nla_len: u16,
pub nla_type: u16,
}
}

pub const SIGSTKSZ: ::size_t = 8192;
Expand Down
18 changes: 0 additions & 18 deletions src/unix/linux_like/linux/musl/b32/mips/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -161,24 +161,6 @@ s! {
pub f_namemax: ::c_ulong,
__f_spare: [::c_int; 6],
}

pub struct nlmsghdr {
pub nlmsg_len: u32,
pub nlmsg_type: u16,
pub nlmsg_flags: u16,
pub nlmsg_seq: u32,
pub nlmsg_pid: u32,
}

pub struct nlmsgerr {
pub error: ::c_int,
pub msg: nlmsghdr,
}

pub struct nlattr {
pub nla_len: u16,
pub nla_type: u16,
}
}

pub const SIGSTKSZ: ::size_t = 8192;
Expand Down
18 changes: 0 additions & 18 deletions src/unix/linux_like/linux/musl/b32/x86/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -154,24 +154,6 @@ s! {
pub f_namemax: ::c_ulong,
__f_spare: [::c_int; 6],
}

pub struct nlmsghdr {
pub nlmsg_len: u32,
pub nlmsg_type: u16,
pub nlmsg_flags: u16,
pub nlmsg_seq: u32,
pub nlmsg_pid: u32,
}

pub struct nlmsgerr {
pub error: ::c_int,
pub msg: nlmsghdr,
}

pub struct nlattr {
pub nla_len: u16,
pub nla_type: u16,
}
}

s_no_extra_traits! {
Expand Down
18 changes: 0 additions & 18 deletions src/unix/linux_like/linux/musl/b64/mips64.rs
Original file line number Diff line number Diff line change
Expand Up @@ -83,24 +83,6 @@ s! {
pub f_spare: [::c_ulong; 5],
}

pub struct nlmsghdr {
pub nlmsg_len: u32,
pub nlmsg_type: u16,
pub nlmsg_flags: u16,
pub nlmsg_seq: u32,
pub nlmsg_pid: u32,
}

pub struct nlmsgerr {
pub error: ::c_int,
pub msg: nlmsghdr,
}

pub struct nlattr {
pub nla_len: u16,
pub nla_type: u16,
}

pub struct ipc_perm {
pub __ipc_perm_key: ::key_t,
pub uid: ::uid_t,
Expand Down
18 changes: 0 additions & 18 deletions src/unix/linux_like/linux/musl/b64/x86_64/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,24 +48,6 @@ s! {
__reserved: [::c_long; 3],
}

pub struct nlmsghdr {
pub nlmsg_len: u32,
pub nlmsg_type: u16,
pub nlmsg_flags: u16,
pub nlmsg_seq: u32,
pub nlmsg_pid: u32,
}

pub struct nlmsgerr {
pub error: ::c_int,
pub msg: nlmsghdr,
}

pub struct nlattr {
pub nla_len: u16,
pub nla_type: u16,
}

pub struct user_regs_struct {
pub r15: ::c_ulong,
pub r14: ::c_ulong,
Expand Down
18 changes: 18 additions & 0 deletions src/unix/linux_like/linux/musl/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,24 @@ s! {
__dummy4: [::c_char; 16],
}

pub struct nlmsghdr {
pub nlmsg_len: u32,
pub nlmsg_type: u16,
pub nlmsg_flags: u16,
pub nlmsg_seq: u32,
pub nlmsg_pid: u32,
}

pub struct nlmsgerr {
pub error: ::c_int,
pub msg: nlmsghdr,
}

pub struct nlattr {
pub nla_len: u16,
pub nla_type: u16,
}

pub struct sigaction {
pub sa_sigaction: ::sighandler_t,
pub sa_mask: ::sigset_t,
Expand Down

0 comments on commit 570d6b0

Please sign in to comment.