Skip to content

Commit 7f1da49

Browse files
committed
Auto merge of #2652 - Mek101:master, r=Amanieu
Fix linux ioctl BLKSSZGET and BLKPBSZGET constants types. The BLKSSZGET and BLKPBSZGET constants weren't arch dependent as they should have.
2 parents fbe86f8 + 426dfab commit 7f1da49

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

src/unix/linux_like/linux/arch/generic/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -230,5 +230,5 @@ pub const TIOCM_DSR: ::c_int = 0x100;
230230
pub const BOTHER: ::speed_t = 0o010000;
231231
pub const IBSHIFT: ::tcflag_t = 16;
232232

233-
pub const BLKSSZGET: ::c_int = 0x1268;
234-
pub const BLKPBSZGET: ::c_int = 0x127B;
233+
pub const BLKSSZGET: ::Ioctl = 0x1268;
234+
pub const BLKPBSZGET: ::Ioctl = 0x127B;

src/unix/linux_like/linux/arch/mips/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -208,5 +208,5 @@ pub const TIOCM_DSR: ::c_int = 0x400;
208208
pub const BOTHER: ::speed_t = 0o010000;
209209
pub const IBSHIFT: ::tcflag_t = 16;
210210

211-
pub const BLKSSZGET: ::c_int = 0x20001268;
212-
pub const BLKPBSZGET: ::c_int = 0x2000127B;
211+
pub const BLKSSZGET: ::Ioctl = 0x20001268;
212+
pub const BLKPBSZGET: ::Ioctl = 0x2000127B;

src/unix/linux_like/linux/arch/powerpc/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -187,5 +187,5 @@ pub const TIOCM_DSR: ::c_int = 0x100;
187187
pub const BOTHER: ::speed_t = 0o0037;
188188
pub const IBSHIFT: ::tcflag_t = 16;
189189

190-
pub const BLKSSZGET: ::c_int = 0x20001268;
191-
pub const BLKPBSZGET: ::c_int = 0x2000127B;
190+
pub const BLKSSZGET: ::Ioctl = 0x20001268;
191+
pub const BLKPBSZGET: ::Ioctl = 0x2000127B;

src/unix/linux_like/linux/arch/sparc/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -194,5 +194,5 @@ pub const TIOCM_DSR: ::c_int = 0x100;
194194
pub const BOTHER: ::speed_t = 0x1000;
195195
pub const IBSHIFT: ::tcflag_t = 16;
196196

197-
pub const BLKSSZGET: ::c_int = 0x20001268;
198-
pub const BLKPBSZGET: ::c_int = 0x2000127B;
197+
pub const BLKSSZGET: ::Ioctl = 0x20001268;
198+
pub const BLKPBSZGET: ::Ioctl = 0x2000127B;

0 commit comments

Comments
 (0)