Auto merge of #1097 - AdelieLinux:master, r=alexcrichton

bors · bors · commit 93a1995d9241 · 2018-10-19T09:40:33.000Z
Correct ioctl(2) interface definition for musl/ppc64
diff --git a/src/unix/notbsd/linux/musl/b64/powerpc64.rs b/src/unix/notbsd/linux/musl/b64/powerpc64.rs
@@ -571,5 +571,5 @@ pub const B3500000: ::speed_t = 0o00035;
 pub const B4000000: ::speed_t = 0o00036;
 
 extern {
-    pub fn ioctl(fd: ::c_int, request: ::c_ulong, ...) -> ::c_int;
+    pub fn ioctl(fd: ::c_int, request: ::c_int, ...) -> ::c_int;
 }

Original file line number	Diff line number	Diff line change
`@@ -571,5 +571,5 @@ pub const B3500000: ::speed_t = 0o00035;`
`571`	`571`	`pub const B4000000: ::speed_t = 0o00036;`
`572`	`572`
`573`	`573`	`extern {`
`574`		`- pub fn ioctl(fd: ::c_int, request: ::c_ulong, ...) -> ::c_int;`
	`574`	`+ pub fn ioctl(fd: ::c_int, request: ::c_int, ...) -> ::c_int;`
`575`	`575`	`}`