Auto merge of #426 - alexcrichton:s390x, r=alexcrichton

Fix the build on s390x
This commit is contained in:
bors 2016-10-10 23:51:06 -07:00 committed by GitHub
commit ebeab042e6
3 changed files with 18 additions and 1 deletions

View File

@ -33,7 +33,7 @@ matrix:
# build documentation
- os: linux
env: TARGET=x86_64-unknown-linux-gnu
rust: stable
rust: nightly
script: sh ci/dox.sh
# stable compat

View File

@ -33,6 +33,9 @@
#![cfg_attr(all(target_os = "linux", target_arch = "aarch64"), doc(
html_root_url = "https://doc.rust-lang.org/libc/aarch64-unknown-linux-gnu"
))]
#![cfg_attr(all(target_os = "linux", target_arch = "s390x"), doc(
html_root_url = "https://doc.rust-lang.org/libc/s390x-unknown-linux-gnu"
))]
#![cfg_attr(all(target_os = "linux", target_env = "musl"), doc(
html_root_url = "https://doc.rust-lang.org/libc/x86_64-unknown-linux-musl"
))]

View File

@ -233,6 +233,20 @@ s! {
pub uc_mcontext: mcontext_t,
pub uc_sigmask: ::sigset_t,
}
pub struct msqid_ds {
pub msg_perm: ::ipc_perm,
pub msg_stime: ::time_t,
pub msg_rtime: ::time_t,
pub msg_ctime: ::time_t,
__msg_cbytes: ::c_ulong,
pub msg_qnum: ::msgqnum_t,
pub msg_qbytes: ::msglen_t,
pub msg_lspid: ::pid_t,
pub msg_lrpid: ::pid_t,
__glibc_reserved4: ::c_ulong,
__glibc_reserved5: ::c_ulong,
}
}
pub const POSIX_FADV_DONTNEED: ::c_int = 6;