diff options
| author | bors <bors@rust-lang.org> | 2022-01-25 10:14:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-01-25 10:14:43 +0000 |
| commit | 7f1da49dd4207d5a0bb28a5838fa21ff7befc4f7 (patch) | |
| tree | c8748c70da83e23d5b952469c6c4381c5736703d | |
| parent | fbe86f81fbf01baf4ac4c734eda91d211a7a0f00 (diff) | |
| parent | 426dfabea877cf195f0fd238a45af5e8c8ef3be4 (diff) | |
| download | rust-libc-7f1da49dd4207d5a0bb28a5838fa21ff7befc4f7.tar.gz | |
Auto merge of #2652 - Mek101:master, r=Amanieu0.2.114
Fix linux ioctl BLKSSZGET and BLKPBSZGET constants types.
The BLKSSZGET and BLKPBSZGET constants weren't arch dependent as they should have.
| -rw-r--r-- | src/unix/linux_like/linux/arch/generic/mod.rs | 4 | ||||
| -rw-r--r-- | src/unix/linux_like/linux/arch/mips/mod.rs | 4 | ||||
| -rw-r--r-- | src/unix/linux_like/linux/arch/powerpc/mod.rs | 4 | ||||
| -rw-r--r-- | src/unix/linux_like/linux/arch/sparc/mod.rs | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/unix/linux_like/linux/arch/generic/mod.rs b/src/unix/linux_like/linux/arch/generic/mod.rs index 738a94b841..223928ccbd 100644 --- a/src/unix/linux_like/linux/arch/generic/mod.rs +++ b/src/unix/linux_like/linux/arch/generic/mod.rs @@ -230,5 +230,5 @@ pub const TIOCM_DSR: ::c_int = 0x100; pub const BOTHER: ::speed_t = 0o010000; pub const IBSHIFT: ::tcflag_t = 16; -pub const BLKSSZGET: ::c_int = 0x1268; -pub const BLKPBSZGET: ::c_int = 0x127B; +pub const BLKSSZGET: ::Ioctl = 0x1268; +pub const BLKPBSZGET: ::Ioctl = 0x127B; diff --git a/src/unix/linux_like/linux/arch/mips/mod.rs b/src/unix/linux_like/linux/arch/mips/mod.rs index 888ec0f0f0..b67b734798 100644 --- a/src/unix/linux_like/linux/arch/mips/mod.rs +++ b/src/unix/linux_like/linux/arch/mips/mod.rs @@ -208,5 +208,5 @@ pub const TIOCM_DSR: ::c_int = 0x400; pub const BOTHER: ::speed_t = 0o010000; pub const IBSHIFT: ::tcflag_t = 16; -pub const BLKSSZGET: ::c_int = 0x20001268; -pub const BLKPBSZGET: ::c_int = 0x2000127B; +pub const BLKSSZGET: ::Ioctl = 0x20001268; +pub const BLKPBSZGET: ::Ioctl = 0x2000127B; diff --git a/src/unix/linux_like/linux/arch/powerpc/mod.rs b/src/unix/linux_like/linux/arch/powerpc/mod.rs index 457650a9ef..d2824d13cb 100644 --- a/src/unix/linux_like/linux/arch/powerpc/mod.rs +++ b/src/unix/linux_like/linux/arch/powerpc/mod.rs @@ -187,5 +187,5 @@ pub const TIOCM_DSR: ::c_int = 0x100; pub const BOTHER: ::speed_t = 0o0037; pub const IBSHIFT: ::tcflag_t = 16; -pub const BLKSSZGET: ::c_int = 0x20001268; -pub const BLKPBSZGET: ::c_int = 0x2000127B; +pub const BLKSSZGET: ::Ioctl = 0x20001268; +pub const BLKPBSZGET: ::Ioctl = 0x2000127B; diff --git a/src/unix/linux_like/linux/arch/sparc/mod.rs b/src/unix/linux_like/linux/arch/sparc/mod.rs index f495766a56..a06fdce457 100644 --- a/src/unix/linux_like/linux/arch/sparc/mod.rs +++ b/src/unix/linux_like/linux/arch/sparc/mod.rs @@ -194,5 +194,5 @@ pub const TIOCM_DSR: ::c_int = 0x100; pub const BOTHER: ::speed_t = 0x1000; pub const IBSHIFT: ::tcflag_t = 16; -pub const BLKSSZGET: ::c_int = 0x20001268; -pub const BLKPBSZGET: ::c_int = 0x2000127B; +pub const BLKSSZGET: ::Ioctl = 0x20001268; +pub const BLKPBSZGET: ::Ioctl = 0x2000127B; |