Consolidate all Ioctl constants and functions by architecture.

5 files changed, 3 insertions, 49 deletions

diff --git a/src/unix/linux_like/linux/uclibc/arm/mod.rs b/src/unix/linux_like/linux/uclibc/arm/mod.rs
index ccc005d48b..dc84b0c054 100644
--- a/src/unix/linux_like/linux/uclibc/arm/mod.rs
+++ b/src/unix/linux_like/linux/uclibc/arm/mod.rs
@@ -417,9 +417,6 @@ pub const EUSERS: ::c_int = 0x57;
 pub const EXFULL: ::c_int = 0x36;
 pub const FF1: ::c_int = 0x8000;
 pub const FFDLY: ::c_int = 0x8000;
-pub const FIONBIO: ::c_ulong = 0x5421;
-pub const FIOCLEX: ::c_ulong = 0x5451;
-pub const FIONCLEX: ::c_ulong = 0x5450;
 pub const FLUSHO: ::tcflag_t = 0x1000;
 pub const F_GETLK: ::c_int = 0x5;
 pub const F_SETLK: ::c_int = 0x6;
@@ -517,8 +514,6 @@ pub const TABDLY: ::c_int = 0x1800;
 pub const TCSADRAIN: ::c_int = 0x1;
 pub const TCSAFLUSH: ::c_int = 0x2;
 pub const TCSANOW: ::c_int = 0;
-pub const TIOCGWINSZ: ::c_int = 0x5413;
-pub const TIOCSWINSZ: ::c_int = 0x5414;
 pub const TOSTOP: ::tcflag_t = 0x100;
 pub const VDISCARD: usize = 0xd;
 pub const VEOF: usize = 0x4;
@@ -893,10 +888,6 @@ pub const SYS_statx: ::c_int = 397;
 pub const SYS_pidfd_open: ::c_long = 434;
 pub const SYS_clone3: ::c_long = 435;
 
-extern "C" {
-    pub fn ioctl(fd: ::c_int, request: ::c_ulong, ...) -> ::c_int;
-}
-
 cfg_if! {
     if #[cfg(libc_align)] {
         mod align;
diff --git a/src/unix/linux_like/linux/uclibc/mips/mips32/mod.rs b/src/unix/linux_like/linux/uclibc/mips/mips32/mod.rs
index c0fe0ab5f5..0791bd4fd8 100644
--- a/src/unix/linux_like/linux/uclibc/mips/mips32/mod.rs
+++ b/src/unix/linux_like/linux/uclibc/mips/mips32/mod.rs
@@ -637,7 +637,6 @@ extern "C" {
         newp: *mut ::c_void,
         newlen: ::size_t,
     ) -> ::c_int;
-    pub fn ioctl(fd: ::c_int, request: ::c_ulong, ...) -> ::c_int;
     pub fn glob64(
         pattern: *const ::c_char,
         flags: ::c_int,
diff --git a/src/unix/linux_like/linux/uclibc/mips/mips64/mod.rs b/src/unix/linux_like/linux/uclibc/mips/mips64/mod.rs
index 735eb851ef..1f693b1fe2 100644
--- a/src/unix/linux_like/linux/uclibc/mips/mips64/mod.rs
+++ b/src/unix/linux_like/linux/uclibc/mips/mips64/mod.rs
@@ -197,11 +197,6 @@ pub const RLIM_INFINITY: ::rlim_t = 0xffff_ffff_ffff_ffff;
 
 pub const SYS_gettid: ::c_long = 5178; // Valid for n64
 
-#[link(name = "util")]
-extern "C" {
-    pub fn ioctl(fd: ::c_int, request: ::c_ulong, ...) -> ::c_int;
-}
-
 cfg_if! {
     if #[cfg(libc_align)] {
         mod align;
diff --git a/src/unix/linux_like/linux/uclibc/mips/mod.rs b/src/unix/linux_like/linux/uclibc/mips/mod.rs
index a724c3e08c..bf81c16b87 100644
--- a/src/unix/linux_like/linux/uclibc/mips/mod.rs
+++ b/src/unix/linux_like/linux/uclibc/mips/mod.rs
@@ -154,10 +154,6 @@ pub const SOCK_STREAM: ::c_int = 2;
 pub const SOCK_DGRAM: ::c_int = 1;
 pub const SOCK_SEQPACKET: ::c_int = 5;
 
-pub const FIOCLEX: ::c_ulong = 0x6601;
-pub const FIONCLEX: ::c_ulong = 0x6602;
-pub const FIONBIO: ::c_ulong = 0x667e;
-
 pub const SA_ONSTACK: ::c_uint = 0x08000000;
 pub const SA_SIGINFO: ::c_uint = 0x00000008;
 pub const SA_NOCLDWAIT: ::c_int = 0x00010000;
@@ -210,9 +206,6 @@ pub const F_SETLKW: ::c_int = 7;
 
 pub const SFD_NONBLOCK: ::c_int = 0x80;
 
-pub const TIOCGWINSZ: ::c_ulong = 0x40087468;
-pub const TIOCSWINSZ: ::c_ulong = 0x80087467;
-
 pub const RTLD_GLOBAL: ::c_int = 0x4;
 
 pub const SIGSTKSZ: ::size_t = 8192;
diff --git a/src/unix/linux_like/linux/uclibc/mod.rs b/src/unix/linux_like/linux/uclibc/mod.rs
index 4f073c49ed..b8416647be 100644
--- a/src/unix/linux_like/linux/uclibc/mod.rs
+++ b/src/unix/linux_like/linux/uclibc/mod.rs
@@ -8,10 +8,10 @@ pub type __priority_which_t = ::c_uint;
 cfg_if! {
     if #[cfg(doc)] {
         // Used in `linux::arch` to define ioctl constants.
-        pub(crate) type Ioctl = ::c_int;
+        pub(crate) type Ioctl = ::c_ulong;
     } else {
         #[doc(hidden)]
-        pub type Ioctl = ::c_int;
+        pub type Ioctl = ::c_ulong;
     }
 }
 
@@ -276,7 +276,6 @@ pub const EXTPROC: ::tcflag_t = 0200000;
 pub const FAN_MARK_FILESYSTEM: ::c_int = 0x00000100;
 pub const FAN_MARK_INODE: ::c_int = 0x00000000;
 pub const FAN_MARK_MOUNT: ::c_int = 0x10;
-pub const FIONREAD: ::c_int = 0x541B;
 pub const FOPEN_MAX: ::c_int = 16;
 pub const F_GETOWN: ::c_int = 9;
 pub const F_OFD_GETLK: ::c_int = 36;
@@ -325,36 +324,13 @@ pub const SHM_EXEC: ::c_int = 0100000;
 pub const SIGPOLL: ::c_int = SIGIO;
 pub const SOCK_DCCP: ::c_int = 6;
 pub const SOCK_PACKET: ::c_int = 10;
-pub const TCFLSH: ::c_int = 0x540B;
-pub const TCGETA: ::c_int = 0x5405;
-pub const TCGETS: ::c_int = 0x5401;
 pub const TCP_COOKIE_TRANSACTIONS: ::c_int = 15;
-pub const TCSBRK: ::c_int = 0x5409;
-pub const TCSETA: ::c_int = 0x5406;
-pub const TCSETAF: ::c_int = 0x5408;
-pub const TCSETAW: ::c_int = 0x5407;
-pub const TCSETS: ::c_int = 0x5402;
-pub const TCSETSF: ::c_int = 0x5404;
-pub const TCSETSW: ::c_int = 0x5403;
-pub const TCXONC: ::c_int = 0x540A;
-pub const TIOCCONS: ::c_int = 0x541D;
-pub const TIOCEXCL: ::c_int = 0x540C;
-pub const TIOCGPGRP: ::c_int = 0x540F;
-pub const TIOCGSERIAL: ::c_int = 0x541E;
-pub const TIOCGSOFTCAR: ::c_int = 0x5419;
-pub const TIOCINQ: ::c_int = FIONREAD;
-pub const TIOCLINUX: ::c_int = 0x541C;
-pub const TIOCNXCL: ::c_int = 0x540D;
-pub const TIOCOUTQ: ::c_int = 0x5411;
-pub const TIOCSCTTY: ::c_int = 0x540E;
-pub const TIOCSPGRP: ::c_int = 0x5410;
-pub const TIOCSSOFTCAR: ::c_int = 0x541A;
-pub const TIOCSTI: ::c_int = 0x5412;
 pub const UDP_GRO: ::c_int = 104;
 pub const UDP_SEGMENT: ::c_int = 103;
 pub const YESEXPR: ::c_int = ((5) << 8) | (0);
 
 extern "C" {
+    pub fn ioctl(fd: ::c_int, request: ::c_ulong, ...) -> ::c_int;
     pub fn gettimeofday(tp: *mut ::timeval, tz: *mut ::timezone) -> ::c_int;
 
     pub fn pthread_rwlockattr_getkind_np(