Skip to content

Commit adafc28

Browse files
espindolatgross35
authored andcommitted
Unify the ioctl declarations on linux
This uses the existing Ioctl type to reduce the duplication. (backport <#3722>) (cherry picked from commit 01a3617)
1 parent 9b88c55 commit adafc28

File tree

4 files changed

+2
-3
lines changed

4 files changed

+2
-3
lines changed

src/unix/linux_like/linux/gnu/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1405,7 +1405,6 @@ extern "C" {
14051405
pub fn reallocarray(ptr: *mut ::c_void, nmemb: ::size_t, size: ::size_t) -> *mut ::c_void;
14061406

14071407
pub fn ctermid(s: *mut ::c_char) -> *mut ::c_char;
1408-
pub fn ioctl(fd: ::c_int, request: ::c_ulong, ...) -> ::c_int;
14091408
pub fn backtrace(buf: *mut *mut ::c_void, sz: ::c_int) -> ::c_int;
14101409
pub fn glob64(
14111410
pattern: *const ::c_char,

src/unix/linux_like/linux/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5635,6 +5635,8 @@ extern "C" {
56355635
) -> ::ssize_t;
56365636

56375637
pub fn klogctl(syslog_type: ::c_int, bufp: *mut ::c_char, len: ::c_int) -> ::c_int;
5638+
5639+
pub fn ioctl(fd: ::c_int, request: ::Ioctl, ...) -> ::c_int;
56385640
}
56395641

56405642
// LFS64 extensions

src/unix/linux_like/linux/musl/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -853,7 +853,6 @@ extern "C" {
853853
new_limit: *const ::rlimit,
854854
old_limit: *mut ::rlimit,
855855
) -> ::c_int;
856-
pub fn ioctl(fd: ::c_int, request: ::c_int, ...) -> ::c_int;
857856
pub fn gettimeofday(tp: *mut ::timeval, tz: *mut ::c_void) -> ::c_int;
858857
pub fn ptrace(request: ::c_int, ...) -> ::c_long;
859858
pub fn getpriority(which: ::c_int, who: ::id_t) -> ::c_int;

src/unix/linux_like/linux/uclibc/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,6 @@ pub const UDP_SEGMENT: ::c_int = 103;
353353
pub const YESEXPR: ::c_int = ((5) << 8) | (0);
354354

355355
extern "C" {
356-
pub fn ioctl(fd: ::c_int, request: ::c_ulong, ...) -> ::c_int;
357356
pub fn gettimeofday(tp: *mut ::timeval, tz: *mut ::timezone) -> ::c_int;
358357

359358
pub fn pthread_rwlockattr_getkind_np(

0 commit comments

Comments
 (0)