Skip to content

Commit da91cdd

Browse files
authored
Auto merge of #426 - alexcrichton:s390x, r=alexcrichton
Fix the build on s390x
2 parents 56b2704 + 0b5288b commit da91cdd

File tree

2 files changed

+17
-0
lines changed

2 files changed

+17
-0
lines changed

src/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@
3333
#![cfg_attr(all(target_os = "linux", target_arch = "aarch64"), doc(
3434
html_root_url = "https://doc.rust-lang.org/libc/aarch64-unknown-linux-gnu"
3535
))]
36+
#![cfg_attr(all(target_os = "linux", target_arch = "s390x"), doc(
37+
html_root_url = "https://doc.rust-lang.org/libc/s390x-unknown-linux-gnu"
38+
))]
3639
#![cfg_attr(all(target_os = "linux", target_env = "musl"), doc(
3740
html_root_url = "https://doc.rust-lang.org/libc/x86_64-unknown-linux-musl"
3841
))]

src/unix/notbsd/linux/s390x.rs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,20 @@ s! {
233233
pub uc_mcontext: mcontext_t,
234234
pub uc_sigmask: ::sigset_t,
235235
}
236+
237+
pub struct msqid_ds {
238+
pub msg_perm: ::ipc_perm,
239+
pub msg_stime: ::time_t,
240+
pub msg_rtime: ::time_t,
241+
pub msg_ctime: ::time_t,
242+
__msg_cbytes: ::c_ulong,
243+
pub msg_qnum: ::msgqnum_t,
244+
pub msg_qbytes: ::msglen_t,
245+
pub msg_lspid: ::pid_t,
246+
pub msg_lrpid: ::pid_t,
247+
__glibc_reserved4: ::c_ulong,
248+
__glibc_reserved5: ::c_ulong,
249+
}
236250
}
237251

238252
pub const POSIX_FADV_DONTNEED: ::c_int = 6;

0 commit comments

Comments
 (0)