diff options
| author | bors <bors@rust-lang.org> | 2016-03-11 22:43:11 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-03-11 22:43:11 -0800 |
| commit | d9f256ec37d5e0750f2394482ae4921cd596fc93 (patch) | |
| tree | 1174b39e6cae29590c88d4443c412f60dc38c252 | |
| parent | 493d79b2ea504a17452223d75c8793e9b0e5058b (diff) | |
| parent | 9e94d5b777321c61f021217e8d56f18d6619d624 (diff) | |
| download | rust-libc-d9f256ec37d5e0750f2394482ae4921cd596fc93.tar.gz | |
Auto merge of #225 - posborne:netlink-android, r=alexcrichton
Pull sockaddr_nl up a layer as it is present for Android
The addition of sockaddr_nl seems to be a fairly recent
addition to bionic, although it would appear that its lack
of presence in previous versions is more of an oversight than
anything else.
https://github.com/android/platform_bionic/blob/831c8a52498d3c7be204a00847275f6e9163626f/libc/kernel/uapi/linux/netlink.h#L54
| -rw-r--r-- | src/unix/notbsd/linux/mod.rs | 7 | ||||
| -rw-r--r-- | src/unix/notbsd/mod.rs | 7 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/unix/notbsd/linux/mod.rs b/src/unix/notbsd/linux/mod.rs index 64adea5a93..6d01a25f40 100644 --- a/src/unix/notbsd/linux/mod.rs +++ b/src/unix/notbsd/linux/mod.rs @@ -126,13 +126,6 @@ s! { __f_spare: [::c_int; 6], } - pub struct sockaddr_nl { - pub nl_family: ::sa_family_t, - nl_pad: ::c_ushort, - pub nl_pid: u32, - pub nl_groups: u32 - } - pub struct dqblk { pub dqb_bhardlimit: ::uint64_t, pub dqb_bsoftlimit: ::uint64_t, diff --git a/src/unix/notbsd/mod.rs b/src/unix/notbsd/mod.rs index 7cdd63cea9..c6d1347c77 100644 --- a/src/unix/notbsd/mod.rs +++ b/src/unix/notbsd/mod.rs @@ -61,6 +61,13 @@ s! { pub ai_next: *mut addrinfo, } + pub struct sockaddr_nl { + pub nl_family: ::sa_family_t, + nl_pad: ::c_ushort, + pub nl_pid: u32, + pub nl_groups: u32 + } + pub struct sockaddr_ll { pub sll_family: ::c_ushort, pub sll_protocol: ::c_ushort, |