Add termios 2 on all platforms

Author: Susurrus

Diff for: libc-test/build.rs

@@ -9,6 +9,7 @@ fn main() {
     let aarch64 = target.contains("aarch64");
     let i686 = target.contains("i686");
     let x86_64 = target.contains("x86_64");
+    let powerpc = target.contains("powerpc");
     let windows = target.contains("windows");
     let mingw = target.contains("windows-gnu");
     let linux = target.contains("unknown-linux");
@@ -377,6 +378,10 @@ fn main() {
             // FIXME: unskip it for next major release
             "stat" | "stat64" if android => true,
 
+            // These are tested as part of the linux_fcntl tests since there are
+            // header conflicts when including them with all the other structs.
+            "termios2" => true,
+
             _ => false
         }
     });
@@ -671,8 +676,16 @@ fn main() {
     // fails on a lot of platforms.
     let mut cfg = ctest::TestGenerator::new();
     cfg.skip_type(|_| true)
-        .skip_struct(|_| true)
-        .skip_fn(|_| true);
+       .type_name(move |ty, _| {
+           match ty {
+               // The termios2 struct is the same as `termios` on powerpc, so it's actually
+               // undeclared in the headers. We'll still expose it there to still provide
+               // some type safety, but we can't check it directly.
+               "termios2" if powerpc => "termios".to_string(),
+               t => t.to_string(),
+           }
+       })
+       .skip_fn(|_| true);
     if android || linux {
         // musl defines these directly in `fcntl.h`
         if musl {

Diff for: src/unix/notbsd/mod.rs

@@ -177,6 +177,17 @@ s! {
         #[cfg(target_pointer_width = "32")]
         __unused1: [::c_int; 12]
     }
+
+    pub struct termios2 {
+        pub c_iflag: ::tcflag_t,
+        pub c_oflag: ::tcflag_t,
+        pub c_cflag: ::tcflag_t,
+        pub c_lflag: ::tcflag_t,
+        pub c_line: ::cc_t,
+        pub c_cc: [::cc_t; 19],
+        pub c_ispeed: ::speed_t,
+        pub c_ospeed: ::speed_t,
+    }
 }
 
 // intentionally not public, only used for fd_set