diff options
| author | bors <bors@rust-lang.org> | 2021-12-09 16:22:28 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-12-09 16:22:28 +0000 |
| commit | bd967ef69e80f6916fc81c3ebb90d1cc02e2c55d (patch) | |
| tree | 2fbd677547b64362f914af5ee68adb665c8fe417 | |
| parent | fb3dec288152d2e077fc0ac9c6a249ff526c641f (diff) | |
| parent | 6b0dc21ea9f5470a3b6a02a9662b85898d1b52d0 (diff) | |
| download | rust-libc-bd967ef69e80f6916fc81c3ebb90d1cc02e2c55d.tar.gz | |
Auto merge of #2548 - Mek101:master, r=Amanieu
Add linux ioctl constansts: BLKSSZGET and BLKPBSZGET
Fixes #2500
| -rw-r--r-- | libc-test/semver/linux.txt | 2 | ||||
| -rw-r--r-- | src/unix/linux_like/linux/arch/generic/mod.rs | 3 | ||||
| -rw-r--r-- | src/unix/linux_like/linux/arch/mips/mod.rs | 3 | ||||
| -rw-r--r-- | src/unix/linux_like/linux/arch/powerpc/mod.rs | 3 | ||||
| -rw-r--r-- | src/unix/linux_like/linux/arch/sparc/mod.rs | 3 |
5 files changed, 14 insertions, 0 deletions
diff --git a/libc-test/semver/linux.txt b/libc-test/semver/linux.txt index 4972bc7d57..822405ab84 100644 --- a/libc-test/semver/linux.txt +++ b/libc-test/semver/linux.txt @@ -189,6 +189,8 @@ B460800 B500000 B576000 B921600 +BLKPBSZGET +BLKSSZGET BOTHER BS0 BS1 diff --git a/src/unix/linux_like/linux/arch/generic/mod.rs b/src/unix/linux_like/linux/arch/generic/mod.rs index f3bed42b51..399e78b8b6 100644 --- a/src/unix/linux_like/linux/arch/generic/mod.rs +++ b/src/unix/linux_like/linux/arch/generic/mod.rs @@ -135,3 +135,6 @@ 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; diff --git a/src/unix/linux_like/linux/arch/mips/mod.rs b/src/unix/linux_like/linux/arch/mips/mod.rs index 1b327687bc..f554676c65 100644 --- a/src/unix/linux_like/linux/arch/mips/mod.rs +++ b/src/unix/linux_like/linux/arch/mips/mod.rs @@ -131,3 +131,6 @@ 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; diff --git a/src/unix/linux_like/linux/arch/powerpc/mod.rs b/src/unix/linux_like/linux/arch/powerpc/mod.rs index b56121cd1b..68f17cade9 100644 --- a/src/unix/linux_like/linux/arch/powerpc/mod.rs +++ b/src/unix/linux_like/linux/arch/powerpc/mod.rs @@ -109,3 +109,6 @@ 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; diff --git a/src/unix/linux_like/linux/arch/sparc/mod.rs b/src/unix/linux_like/linux/arch/sparc/mod.rs index 1d384c83cb..74e36d6519 100644 --- a/src/unix/linux_like/linux/arch/sparc/mod.rs +++ b/src/unix/linux_like/linux/arch/sparc/mod.rs @@ -123,3 +123,6 @@ 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; |