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.
This commit is contained in:
commit
7f1da49dd4
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue