tidy and last minute fixes

Jorge Aparicio · Jorge Aparicio · commit 67615b49d5ea · 2016-12-31T20:00:49.000-05:00
diff --git a/src/unix/notbsd/linux/other/b32/mod.rs b/src/unix/notbsd/linux/other/b32/mod.rs
@@ -63,6 +63,9 @@ s! {
     }
 }
 
+pub const TIOCGSOFTCAR: ::c_ulong = 0x5419;
+pub const TIOCSSOFTCAR: ::c_ulong = 0x541A;
+
 pub const RLIMIT_NOFILE: ::c_int = 7;
 pub const RLIMIT_NPROC: ::c_int = 6;
 
diff --git a/src/unix/notbsd/linux/other/b64/aarch64.rs b/src/unix/notbsd/linux/other/b64/aarch64.rs
@@ -82,6 +82,9 @@ s! {
     }
 }
 
+pub const TIOCGSOFTCAR: ::c_ulong = 0x5419;
+pub const TIOCSSOFTCAR: ::c_ulong = 0x541A;
+
 pub const RLIMIT_NOFILE: ::c_int = 7;
 pub const RLIMIT_NPROC: ::c_int = 6;
 
diff --git a/src/unix/notbsd/linux/other/b64/powerpc64.rs b/src/unix/notbsd/linux/other/b64/powerpc64.rs
@@ -80,6 +80,9 @@ s! {
     }
 }
 
+pub const TIOCGSOFTCAR: ::c_ulong = 0x5419;
+pub const TIOCSSOFTCAR: ::c_ulong = 0x541A;
+
 pub const RLIMIT_NOFILE: ::c_int = 7;
 pub const RLIMIT_NPROC: ::c_int = 6;
 
diff --git a/src/unix/notbsd/linux/other/b64/sparc64.rs b/src/unix/notbsd/linux/other/b64/sparc64.rs
@@ -82,6 +82,9 @@ s! {
     }
 }
 
+pub const TIOCGSOFTCAR: ::c_ulong = 0x40047464;
+pub const TIOCSSOFTCAR: ::c_ulong = 0x80047465;
+
 pub const RLIMIT_NOFILE: ::c_int = 6;
 pub const RLIMIT_NPROC: ::c_int = 7;
 
diff --git a/src/unix/notbsd/linux/other/b64/x86_64.rs b/src/unix/notbsd/linux/other/b64/x86_64.rs
@@ -121,6 +121,9 @@ s! {
     }
 }
 
+pub const TIOCGSOFTCAR: ::c_ulong = 0x5419;
+pub const TIOCSSOFTCAR: ::c_ulong = 0x541A;
+
 pub const RLIMIT_NOFILE: ::c_int = 7;
 pub const RLIMIT_NPROC: ::c_int = 6;
 
diff --git a/src/unix/notbsd/linux/other/mod.rs b/src/unix/notbsd/linux/other/mod.rs
@@ -42,14 +42,22 @@ s! {
         pub ut_host: [::c_char; __UT_HOSTSIZE],
         pub ut_exit: __exit_status,
 
-        #[cfg(any(target_arch = "aarch64", target_arch = "sparc64", target_pointer_width = "32"))]
+        #[cfg(any(target_arch = "aarch64",
+                  target_arch = "sparc64",
+                  target_pointer_width = "32"))]
         pub ut_session: ::c_long,
-        #[cfg(any(target_arch = "aarch64", target_arch = "sparc64", target_pointer_width = "32"))]
+        #[cfg(any(target_arch = "aarch64",
+                  target_arch = "sparc64",
+                  target_pointer_width = "32"))]
         pub ut_tv: ::timeval,
 
-        #[cfg(not(any(target_arch = "aarch64", target_arch = "sparc64", target_pointer_width = "32")))]
+        #[cfg(not(any(target_arch = "aarch64",
+                      target_arch = "sparc64",
+                      target_pointer_width = "32")))]
         pub ut_session: ::int32_t,
-        #[cfg(not(any(target_arch = "aarch64", target_arch = "sparc64", target_pointer_width = "32")))]
+        #[cfg(not(any(target_arch = "aarch64",
+                      target_arch = "sparc64",
+                      target_pointer_width = "32")))]
         pub ut_tv: __timeval,
 
         pub ut_addr_v6: [::int32_t; 4],
@@ -339,8 +347,6 @@ pub const TCSANOW: ::c_int = 0;
 pub const TCSADRAIN: ::c_int = 1;
 pub const TCSAFLUSH: ::c_int = 2;
 
-pub const TIOCGSOFTCAR: ::c_ulong = 0x40047464;
-pub const TIOCSSOFTCAR: ::c_ulong = 0x80047465;
 pub const TIOCLINUX: ::c_ulong = 0x541C;
 pub const TIOCGSERIAL: ::c_ulong = 0x541E;
 

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,9 @@ s! {`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`
	`66`	`+pub const TIOCGSOFTCAR: ::c_ulong = 0x5419;`
	`67`	`+pub const TIOCSSOFTCAR: ::c_ulong = 0x541A;`
	`68`	`+`
`66`	`69`	`pub const RLIMIT_NOFILE: ::c_int = 7;`
`67`	`70`	`pub const RLIMIT_NPROC: ::c_int = 6;`
`68`	`71`
Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,9 @@ s! {`
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`
	`85`	`+pub const TIOCGSOFTCAR: ::c_ulong = 0x5419;`
	`86`	`+pub const TIOCSSOFTCAR: ::c_ulong = 0x541A;`
	`87`	`+`
`85`	`88`	`pub const RLIMIT_NOFILE: ::c_int = 7;`
`86`	`89`	`pub const RLIMIT_NPROC: ::c_int = 6;`
`87`	`90`
Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,9 @@ s! {`
`80`	`80`	`}`
`81`	`81`	`}`
`82`	`82`
	`83`	`+pub const TIOCGSOFTCAR: ::c_ulong = 0x5419;`
	`84`	`+pub const TIOCSSOFTCAR: ::c_ulong = 0x541A;`
	`85`	`+`
`83`	`86`	`pub const RLIMIT_NOFILE: ::c_int = 7;`
`84`	`87`	`pub const RLIMIT_NPROC: ::c_int = 6;`
`85`	`88`
Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,9 @@ s! {`
`121`	`121`	`}`
`122`	`122`	`}`
`123`	`123`
	`124`	`+pub const TIOCGSOFTCAR: ::c_ulong = 0x5419;`
	`125`	`+pub const TIOCSSOFTCAR: ::c_ulong = 0x541A;`
	`126`	`+`
`124`	`127`	`pub const RLIMIT_NOFILE: ::c_int = 7;`
`125`	`128`	`pub const RLIMIT_NPROC: ::c_int = 6;`
`126`	`129`