Skip to content

Commit 01a3617

Browse files
committed
Unify the ioctl declarations on linux
This uses the existing Ioctl type to reduce the duplication.
1 parent 1ffe0bd commit 01a3617

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
@@ -1396,7 +1396,6 @@ extern "C" {
13961396
pub fn reallocarray(ptr: *mut ::c_void, nmemb: ::size_t, size: ::size_t) -> *mut ::c_void;
13971397

13981398
pub fn ctermid(s: *mut ::c_char) -> *mut ::c_char;
1399-
pub fn ioctl(fd: ::c_int, request: ::c_ulong, ...) -> ::c_int;
14001399
pub fn backtrace(buf: *mut *mut ::c_void, sz: ::c_int) -> ::c_int;
14011400
pub fn glob64(
14021401
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
@@ -6125,6 +6125,8 @@ extern "C" {
61256125
) -> ::ssize_t;
61266126

61276127
pub fn klogctl(syslog_type: ::c_int, bufp: *mut ::c_char, len: ::c_int) -> ::c_int;
6128+
6129+
pub fn ioctl(fd: ::c_int, request: ::Ioctl, ...) -> ::c_int;
61286130
}
61296131

61306132
// LFS64 extensions

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -843,7 +843,6 @@ extern "C" {
843843
new_limit: *const ::rlimit,
844844
old_limit: *mut ::rlimit,
845845
) -> ::c_int;
846-
pub fn ioctl(fd: ::c_int, request: ::c_int, ...) -> ::c_int;
847846
pub fn gettimeofday(tp: *mut ::timeval, tz: *mut ::c_void) -> ::c_int;
848847
pub fn ptrace(request: ::c_int, ...) -> ::c_long;
849848
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)