Delete duplicate types

Now that we use cbindgen differently :D
2018-09-02 08:17:15 +02:00
parent dbe18b92f0
commit 6fe3e05ea0
30 changed files with 148 additions and 278 deletions
@@ -1,26 +1,27 @@
 //! sys/utsname implementation for linux, following http://pubs.opengroup.org/onlinepubs/7908799/xsh/sysutsname.h.html

+use platform::types::*;
+
+pub const UTSLENGTH: usize = 65;
+
+#[repr(C)]
+pub struct utsname {
+    pub sysname: [c_char; UTSLENGTH],
+    pub nodename: [c_char; UTSLENGTH],
+    pub release: [c_char; UTSLENGTH],
+    pub version: [c_char; UTSLENGTH],
+    pub machine: [c_char; UTSLENGTH],
+    pub domainname: [c_char; UTSLENGTH],
+}
+
 #[cfg(target_os = "linux")]
 mod inner {
-    use platform;
-    use platform::types::*;
    use platform::{Pal, Sys};
-
-    const UTSLENGTH: usize = 65;
-
-    #[repr(C)]
-    pub struct utsname {
-        pub sysname: [c_char; UTSLENGTH],
-        pub nodename: [c_char; UTSLENGTH],
-        pub release: [c_char; UTSLENGTH],
-        pub version: [c_char; UTSLENGTH],
-        pub machine: [c_char; UTSLENGTH],
-        pub domainname: [c_char; UTSLENGTH],
-    }
+    use super::*;

    #[no_mangle]
    pub unsafe extern "C" fn uname(uts: *mut utsname) -> c_int {
-        Sys::uname(uts as *mut platform::types::utsname)
+        Sys::uname(uts)
    }
 }
 #[cfg(target_os = "linux")]