Merge branch 'termios-systypes' into 'master'

replace sys_types with bits for termios

See merge request redox-os/relibc!1295

src/header/sys_ioctl/cbindgen.toml

@@ -1,7 +1,5 @@
-include_guard = "_SYS_IOCTL_H"
-language = "C"
-style = "Tag"
-trailer = """
+include_guard = "_RELIBC_SYS_IOCTL_H"
+after_includes = """
 // Shamelessly copy-pasted from musl
 
 #define _IOC(a,b,c,d) ( ((a)<<30) | ((b)<<8) | (c) | ((d)<<16) )
@@ -14,6 +12,8 @@ trailer = """
 #define _IOR(a,b,c) _IOC(_IOC_READ,(a),(b),sizeof(c))
 #define _IOWR(a,b,c) _IOC(_IOC_READ|_IOC_WRITE,(a),(b),sizeof(c))
 """
+language = "C"
+style = "Tag"
 no_includes = true
 cpp_compat = true
 

src/header/termios/cbindgen.toml

@@ -2,7 +2,10 @@
 #
 # Spec quotations relating to includes:
 # - "The <termios.h> header shall define the pid_t type as described in <sys/types.h>."
-sys_includes = ["sys/types.h"]
+sys_includes = []
+after_includes = """
+#include <bits/pid-t.h> // for pid_t from sys/types.h
+"""
 include_guard = "_RELIBC_TERMIOS_H"
 language = "C"
 style = "Tag"

src/header/termios/mod.rs

@@ -3,16 +3,15 @@
 //! See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/termios.h.html>.
 
 use crate::{
-    header::{
-        errno,
-        sys_ioctl::{self, winsize},
-    },
+    header::{errno, sys_ioctl},
     platform::{
         self,
         types::{c_int, c_uchar, c_uint, c_ulong, c_void, pid_t},
     },
 };
 
+pub use crate::header::sys_ioctl::winsize;
+
 pub use self::sys::*;
 
 #[cfg(target_os = "linux")]