diff options
| author | bors <bors@rust-lang.org> | 2022-01-17 02:00:08 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-01-17 02:00:08 +0000 |
| commit | f0ba214ebb49706e0d68d694e3448771e70ed8ed (patch) | |
| tree | 6fb9786660d91649be4004b8ed238f8ea9c5bead | |
| parent | 5617b46596c38e5a8ab7124c9839048e1f054235 (diff) | |
| parent | ecb5345b1982949ab44a3524a17c4e21997212f8 (diff) | |
| download | rust-libc-f0ba214ebb49706e0d68d694e3448771e70ed8ed.tar.gz | |
Auto merge of #2630 - kaniini:chore/s390x-musl-fixes, r=Amanieu
Fix definitions for the s390x-musl target.
When I was creating the original s390x musl definitions, I copied a little too closely from glibc for the ioctl(2) constants. This was then exacerbated in c7c238d812 with the creation of an erroneous definition.
| -rw-r--r-- | src/unix/linux_like/linux/musl/b64/s390x.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/unix/linux_like/linux/musl/b64/s390x.rs b/src/unix/linux_like/linux/musl/b64/s390x.rs index 99ae0e6650..5961eafca3 100644 --- a/src/unix/linux_like/linux/musl/b64/s390x.rs +++ b/src/unix/linux_like/linux/musl/b64/s390x.rs @@ -141,9 +141,9 @@ pub const EDEADLK: ::c_int = 35; pub const ENOSYS: ::c_int = 38; pub const ENOTCONN: ::c_int = 107; pub const ETIMEDOUT: ::c_int = 110; -pub const FIOCLEX: ::c_ulong = 0x5451; -pub const FIONCLEX: ::c_ulong = 0x5450; -pub const FIONBIO: ::c_ulong = 0x5421; +pub const FIOCLEX: ::c_int = 0x5451; +pub const FIONCLEX: ::c_int = 0x5450; +pub const FIONBIO: ::c_int = 0x5421; pub const O_APPEND: ::c_int = 1024; pub const O_CREAT: ::c_int = 64; pub const O_EXCL: ::c_int = 128; @@ -743,5 +743,5 @@ pub const SYS_epoll_pwait2: ::c_long = 441; pub const SYS_mount_setattr: ::c_long = 442; extern "C" { - pub fn ioctl(fd: ::c_int, request: ::c_ulong, ...) -> ::c_int; + pub fn ioctl(fd: ::c_int, request: ::c_int, ...) -> ::c_int; } |