diff options
| author | bors <bors@rust-lang.org> | 2019-11-28 14:38:37 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-11-28 14:38:37 +0000 |
| commit | cfd561c28987bed1f925e358d8ab03ad8cd9b085 (patch) | |
| tree | abae3ef71ad61be5e51fdf7e086500bf3779069e | |
| parent | 51ae96a5b0e9b87e947727492433fa316a10ba53 (diff) | |
| parent | 7335d1e4cda84ce60901da65934ae00bef47c56a (diff) | |
| download | rust-libc-cfd561c28987bed1f925e358d8ab03ad8cd9b085.tar.gz | |
Auto merge of #1605 - zvirja:fix-mipsel-unknown-linux-uclibc, r=gnzlbg
Add ucred and socket related types to uclibc-mips32
Fix compilation of the [tokio](https://github.com/tokio-rs) rust for MIPS architecture when using uClibc. Added missed types, which are defined in library headers:
https://github.com/kraj/uClibc/blob/ca1c74d67dd115d059a875150e10b8560a9c35a8/libc/sysdeps/linux/common/bits/socket.h#L320
https://github.com/kraj/uClibc/blob/ca1c74d67dd115d059a875150e10b8560a9c35a8/libc/sysdeps/linux/common/bits/in.h#L35-L36
https://github.com/kraj/uClibc/blob/ca1c74d67dd115d059a875150e10b8560a9c35a8/libc/sysdeps/linux/common/bits/in.h#L140-L143
Should also solve https://github.com/rust-lang-nursery/net2-rs/issues/88
Revisit of #1500
| -rw-r--r-- | src/unix/uclibc/mod.rs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/unix/uclibc/mod.rs b/src/unix/uclibc/mod.rs index c479f40016..b4fe036880 100644 --- a/src/unix/uclibc/mod.rs +++ b/src/unix/uclibc/mod.rs @@ -288,6 +288,12 @@ s! { pub msgtql: ::c_int, pub msgseg: ::c_ushort, } + + pub struct ucred { + pub pid: ::pid_t, + pub uid: ::uid_t, + pub gid: ::gid_t, + } } s_no_extra_traits! { |