Skip to content

Commit 45d8589

Browse files
borsbors
committed
Auto merge of rust-lang#301 - Amanieu:musl_ioctl, r=alexcrichton
Fix ioctl types for non-x86 musl This fixes up rust-lang#289 by changing the type for other platforms as well.
2 parents bb4dabb + aa4a2c6 commit 45d8589

File tree

3 files changed

+90
-90
lines changed

3 files changed

+90
-90
lines changed

‎src/unix/notbsd/linux/musl/b32/arm.rs

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -273,36 +273,36 @@ pub const IEXTEN: ::tcflag_t = 0x00008000;
273273
pub const TOSTOP: ::tcflag_t = 0x00000100;
274274
pub const FLUSHO: ::tcflag_t = 0x00001000;
275275

276-
pub const TCGETS: ::c_ulong = 0x5401;
277-
pub const TCSETS: ::c_ulong = 0x5402;
278-
pub const TCSETSW: ::c_ulong = 0x5403;
279-
pub const TCSETSF: ::c_ulong = 0x5404;
280-
pub const TCGETA: ::c_ulong = 0x5405;
281-
pub const TCSETA: ::c_ulong = 0x5406;
282-
pub const TCSETAW: ::c_ulong = 0x5407;
283-
pub const TCSETAF: ::c_ulong = 0x5408;
284-
pub const TCSBRK: ::c_ulong = 0x5409;
285-
pub const TCXONC: ::c_ulong = 0x540A;
286-
pub const TCFLSH: ::c_ulong = 0x540B;
287-
pub const TIOCGSOFTCAR: ::c_ulong = 0x5419;
288-
pub const TIOCSSOFTCAR: ::c_ulong = 0x541A;
289-
pub const TIOCLINUX: ::c_ulong = 0x541C;
290-
pub const TIOCGSERIAL: ::c_ulong = 0x541E;
291-
pub const TIOCEXCL: ::c_ulong = 0x540C;
292-
pub const TIOCNXCL: ::c_ulong = 0x540D;
293-
pub const TIOCSCTTY: ::c_ulong = 0x540E;
294-
pub const TIOCGPGRP: ::c_ulong = 0x540F;
295-
pub const TIOCSPGRP: ::c_ulong = 0x5410;
296-
pub const TIOCOUTQ: ::c_ulong = 0x5411;
297-
pub const TIOCSTI: ::c_ulong = 0x5412;
298-
pub const TIOCGWINSZ: ::c_ulong = 0x5413;
299-
pub const TIOCSWINSZ: ::c_ulong = 0x5414;
300-
pub const TIOCMGET: ::c_ulong = 0x5415;
301-
pub const TIOCMBIS: ::c_ulong = 0x5416;
302-
pub const TIOCMBIC: ::c_ulong = 0x5417;
303-
pub const TIOCMSET: ::c_ulong = 0x5418;
304-
pub const FIONREAD: ::c_ulong = 0x541B;
305-
pub const TIOCCONS: ::c_ulong = 0x541D;
276+
pub const TCGETS: ::c_int = 0x5401;
277+
pub const TCSETS: ::c_int = 0x5402;
278+
pub const TCSETSW: ::c_int = 0x5403;
279+
pub const TCSETSF: ::c_int = 0x5404;
280+
pub const TCGETA: ::c_int = 0x5405;
281+
pub const TCSETA: ::c_int = 0x5406;
282+
pub const TCSETAW: ::c_int = 0x5407;
283+
pub const TCSETAF: ::c_int = 0x5408;
284+
pub const TCSBRK: ::c_int = 0x5409;
285+
pub const TCXONC: ::c_int = 0x540A;
286+
pub const TCFLSH: ::c_int = 0x540B;
287+
pub const TIOCGSOFTCAR: ::c_int = 0x5419;
288+
pub const TIOCSSOFTCAR: ::c_int = 0x541A;
289+
pub const TIOCLINUX: ::c_int = 0x541C;
290+
pub const TIOCGSERIAL: ::c_int = 0x541E;
291+
pub const TIOCEXCL: ::c_int = 0x540C;
292+
pub const TIOCNXCL: ::c_int = 0x540D;
293+
pub const TIOCSCTTY: ::c_int = 0x540E;
294+
pub const TIOCGPGRP: ::c_int = 0x540F;
295+
pub const TIOCSPGRP: ::c_int = 0x5410;
296+
pub const TIOCOUTQ: ::c_int = 0x5411;
297+
pub const TIOCSTI: ::c_int = 0x5412;
298+
pub const TIOCGWINSZ: ::c_int = 0x5413;
299+
pub const TIOCSWINSZ: ::c_int = 0x5414;
300+
pub const TIOCMGET: ::c_int = 0x5415;
301+
pub const TIOCMBIS: ::c_int = 0x5416;
302+
pub const TIOCMBIC: ::c_int = 0x5417;
303+
pub const TIOCMSET: ::c_int = 0x5418;
304+
pub const FIONREAD: ::c_int = 0x541B;
305+
pub const TIOCCONS: ::c_int = 0x541D;
306306

307307
pub const SYS_gettid: ::c_long = 224;
308308
pub const SYS_perf_event_open: ::c_long = 364;

‎src/unix/notbsd/linux/musl/b32/asmjs.rs

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -273,35 +273,35 @@ pub const IEXTEN: ::tcflag_t = 0x00008000;
273273
pub const TOSTOP: ::tcflag_t = 0x00000100;
274274
pub const FLUSHO: ::tcflag_t = 0x00001000;
275275

276-
pub const TCGETS: ::c_ulong = 0x5401;
277-
pub const TCSETS: ::c_ulong = 0x5402;
278-
pub const TCSETSW: ::c_ulong = 0x5403;
279-
pub const TCSETSF: ::c_ulong = 0x5404;
280-
pub const TCGETA: ::c_ulong = 0x5405;
281-
pub const TCSETA: ::c_ulong = 0x5406;
282-
pub const TCSETAW: ::c_ulong = 0x5407;
283-
pub const TCSETAF: ::c_ulong = 0x5408;
284-
pub const TCSBRK: ::c_ulong = 0x5409;
285-
pub const TCXONC: ::c_ulong = 0x540A;
286-
pub const TCFLSH: ::c_ulong = 0x540B;
287-
pub const TIOCGSOFTCAR: ::c_ulong = 0x5419;
288-
pub const TIOCSSOFTCAR: ::c_ulong = 0x541A;
289-
pub const TIOCLINUX: ::c_ulong = 0x541C;
290-
pub const TIOCGSERIAL: ::c_ulong = 0x541E;
291-
pub const TIOCEXCL: ::c_ulong = 0x540C;
292-
pub const TIOCNXCL: ::c_ulong = 0x540D;
293-
pub const TIOCSCTTY: ::c_ulong = 0x540E;
294-
pub const TIOCGPGRP: ::c_ulong = 0x540F;
295-
pub const TIOCSPGRP: ::c_ulong = 0x5410;
296-
pub const TIOCOUTQ: ::c_ulong = 0x5411;
297-
pub const TIOCSTI: ::c_ulong = 0x5412;
298-
pub const TIOCGWINSZ: ::c_ulong = 0x5413;
299-
pub const TIOCSWINSZ: ::c_ulong = 0x5414;
300-
pub const TIOCMGET: ::c_ulong = 0x5415;
301-
pub const TIOCMBIS: ::c_ulong = 0x5416;
302-
pub const TIOCMBIC: ::c_ulong = 0x5417;
303-
pub const TIOCMSET: ::c_ulong = 0x5418;
304-
pub const FIONREAD: ::c_ulong = 0x541B;
305-
pub const TIOCCONS: ::c_ulong = 0x541D;
276+
pub const TCGETS: ::c_int = 0x5401;
277+
pub const TCSETS: ::c_int = 0x5402;
278+
pub const TCSETSW: ::c_int = 0x5403;
279+
pub const TCSETSF: ::c_int = 0x5404;
280+
pub const TCGETA: ::c_int = 0x5405;
281+
pub const TCSETA: ::c_int = 0x5406;
282+
pub const TCSETAW: ::c_int = 0x5407;
283+
pub const TCSETAF: ::c_int = 0x5408;
284+
pub const TCSBRK: ::c_int = 0x5409;
285+
pub const TCXONC: ::c_int = 0x540A;
286+
pub const TCFLSH: ::c_int = 0x540B;
287+
pub const TIOCGSOFTCAR: ::c_int = 0x5419;
288+
pub const TIOCSSOFTCAR: ::c_int = 0x541A;
289+
pub const TIOCLINUX: ::c_int = 0x541C;
290+
pub const TIOCGSERIAL: ::c_int = 0x541E;
291+
pub const TIOCEXCL: ::c_int = 0x540C;
292+
pub const TIOCNXCL: ::c_int = 0x540D;
293+
pub const TIOCSCTTY: ::c_int = 0x540E;
294+
pub const TIOCGPGRP: ::c_int = 0x540F;
295+
pub const TIOCSPGRP: ::c_int = 0x5410;
296+
pub const TIOCOUTQ: ::c_int = 0x5411;
297+
pub const TIOCSTI: ::c_int = 0x5412;
298+
pub const TIOCGWINSZ: ::c_int = 0x5413;
299+
pub const TIOCSWINSZ: ::c_int = 0x5414;
300+
pub const TIOCMGET: ::c_int = 0x5415;
301+
pub const TIOCMBIS: ::c_int = 0x5416;
302+
pub const TIOCMBIC: ::c_int = 0x5417;
303+
pub const TIOCMSET: ::c_int = 0x5418;
304+
pub const FIONREAD: ::c_int = 0x541B;
305+
pub const TIOCCONS: ::c_int = 0x541D;
306306

307307
pub const SYS_gettid: ::c_long = 224; // Valid for arm (32-bit) and x86 (32-bit)

‎src/unix/notbsd/linux/musl/b32/mips.rs

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -272,36 +272,36 @@ pub const IEXTEN: ::tcflag_t = 0o000400;
272272
pub const TOSTOP: ::tcflag_t = 0o100000;
273273
pub const FLUSHO: ::tcflag_t = 0o020000;
274274

275-
pub const TCGETS: ::c_ulong = 0x540D;
276-
pub const TCSETS: ::c_ulong = 0x540E;
277-
pub const TCSETSW: ::c_ulong = 0x540F;
278-
pub const TCSETSF: ::c_ulong = 0x5410;
279-
pub const TCGETA: ::c_ulong = 0x5401;
280-
pub const TCSETA: ::c_ulong = 0x5402;
281-
pub const TCSETAW: ::c_ulong = 0x5403;
282-
pub const TCSETAF: ::c_ulong = 0x5404;
283-
pub const TCSBRK: ::c_ulong = 0x5405;
284-
pub const TCXONC: ::c_ulong = 0x5406;
285-
pub const TCFLSH: ::c_ulong = 0x5407;
286-
pub const TIOCGSOFTCAR: ::c_ulong = 0x5481;
287-
pub const TIOCSSOFTCAR: ::c_ulong = 0x5482;
288-
pub const TIOCLINUX: ::c_ulong = 0x5483;
289-
pub const TIOCGSERIAL: ::c_ulong = 0x5484;
290-
pub const TIOCEXCL: ::c_ulong = 0x740D;
291-
pub const TIOCNXCL: ::c_ulong = 0x740E;
292-
pub const TIOCSCTTY: ::c_ulong = 0x5480;
293-
pub const TIOCGPGRP: ::c_ulong = 0x40047477;
294-
pub const TIOCSPGRP: ::c_ulong = 0x80047476;
295-
pub const TIOCOUTQ: ::c_ulong = 0x7472;
296-
pub const TIOCSTI: ::c_ulong = 0x5472;
297-
pub const TIOCGWINSZ: ::c_ulong = 0x40087468;
298-
pub const TIOCSWINSZ: ::c_ulong = 0x80087467;
299-
pub const TIOCMGET: ::c_ulong = 0x741D;
300-
pub const TIOCMBIS: ::c_ulong = 0x741B;
301-
pub const TIOCMBIC: ::c_ulong = 0x741C;
302-
pub const TIOCMSET: ::c_ulong = 0x741D;
303-
pub const FIONREAD: ::c_ulong = 0x467F;
304-
pub const TIOCCONS: ::c_ulong = 0x80047478;
275+
pub const TCGETS: ::c_int = 0x540D;
276+
pub const TCSETS: ::c_int = 0x540E;
277+
pub const TCSETSW: ::c_int = 0x540F;
278+
pub const TCSETSF: ::c_int = 0x5410;
279+
pub const TCGETA: ::c_int = 0x5401;
280+
pub const TCSETA: ::c_int = 0x5402;
281+
pub const TCSETAW: ::c_int = 0x5403;
282+
pub const TCSETAF: ::c_int = 0x5404;
283+
pub const TCSBRK: ::c_int = 0x5405;
284+
pub const TCXONC: ::c_int = 0x5406;
285+
pub const TCFLSH: ::c_int = 0x5407;
286+
pub const TIOCGSOFTCAR: ::c_int = 0x5481;
287+
pub const TIOCSSOFTCAR: ::c_int = 0x5482;
288+
pub const TIOCLINUX: ::c_int = 0x5483;
289+
pub const TIOCGSERIAL: ::c_int = 0x5484;
290+
pub const TIOCEXCL: ::c_int = 0x740D;
291+
pub const TIOCNXCL: ::c_int = 0x740E;
292+
pub const TIOCSCTTY: ::c_int = 0x5480;
293+
pub const TIOCGPGRP: ::c_int = 0x40047477;
294+
pub const TIOCSPGRP: ::c_int = 0x80047476;
295+
pub const TIOCOUTQ: ::c_int = 0x7472;
296+
pub const TIOCSTI: ::c_int = 0x5472;
297+
pub const TIOCGWINSZ: ::c_int = 0x40087468;
298+
pub const TIOCSWINSZ: ::c_int = 0x80087467;
299+
pub const TIOCMGET: ::c_int = 0x741D;
300+
pub const TIOCMBIS: ::c_int = 0x741B;
301+
pub const TIOCMBIC: ::c_int = 0x741C;
302+
pub const TIOCMSET: ::c_int = 0x741D;
303+
pub const FIONREAD: ::c_int = 0x467F;
304+
pub const TIOCCONS: ::c_int = 0x80047478;
305305

306306
pub const SYS_gettid: ::c_long = 4222; // Valid for O32
307307
pub const SYS_perf_event_open: ::c_long = 4333; // Valid for O32

0 commit comments

Comments
 (0)