Changes requested by reviewers

rust-lang · Jan 10, 2017 · 984fb54 · 984fb54
1 parent f05e48c
commit 984fb54
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 37 deletions.
diff --git a/src/unix/bsd/freebsdlike/freebsd/mod.rs b/src/unix/bsd/freebsdlike/freebsd/mod.rs
@@ -9,11 +9,6 @@ pub type sem_t = _sem;
 
 pub type fsblkcnt_t = ::uint64_t;
 pub type fsfilcnt_t = ::uint64_t;
-
-// idtype_t is specified as a C enum:
-// http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/sys_wait.h.html
-// However, FFI doesn't currently know how to ABI-match a C enum
-// (rust#28925, rust#34641).
 pub type idtype_t = ::c_uint;
 
 s! {

diff --git a/src/unix/bsd/netbsdlike/netbsd/mod.rs b/src/unix/bsd/netbsdlike/netbsd/mod.rs
@@ -4,11 +4,6 @@ pub type dev_t = u64;
 pub type blksize_t = ::int32_t;
 pub type fsblkcnt_t = ::uint64_t;
 pub type fsfilcnt_t = ::uint64_t;
-
-// idtype_t is specified as a C enum:
-// http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/sys_wait.h.html
-// However, FFI doesn't currently know how to ABI-match a C enum
-// (rust#28925, rust#34641).
 pub type idtype_t = ::c_int;
 
 s! {
@@ -673,11 +668,6 @@ extern {
     pub fn newlocale(mask: ::c_int,
                      locale: *const ::c_char,
                      base: ::locale_t) -> ::locale_t;
-
-    // This should work, but it causes the netbsd CI build to fail with an
-    // intra-libc.a undefined reference to `wait6`.
-    //pub fn waitid(idtype: idtype_t, id: id_t, infop: *mut ::siginfo_t,
-    //              options: ::c_int) -> ::c_int;
 }
 
 mod other;

diff --git a/src/unix/haiku/mod.rs b/src/unix/haiku/mod.rs
@@ -29,11 +29,6 @@ pub type fsfilcnt_t = i64;
 pub type pthread_attr_t = *mut ::c_void;
 pub type nl_item = ::c_int;
 pub type id_t = i32;
-
-// idtype_t is specified as a C enum:
-// http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/sys_wait.h.html
-// However, FFI doesn't currently know how to ABI-match a C enum
-// (rust#28925, rust#34641).
 pub type idtype_t = ::c_uint;
 
 pub enum timezone {}

diff --git a/src/unix/notbsd/android/mod.rs b/src/unix/notbsd/android/mod.rs
@@ -25,6 +25,7 @@ pub type rlim_t = ::c_ulong;
 pub type dev_t = ::c_ulong;
 pub type ino_t = ::c_ulong;
 pub type __CPU_BITTYPE = ::c_ulong;
+pub type idtype_t = ::c_int;
 
 s! {
     pub struct dirent {

diff --git a/src/unix/notbsd/linux/mod.rs b/src/unix/notbsd/linux/mod.rs
@@ -17,6 +17,7 @@ pub type msgqnum_t = ::c_ulong;
 pub type msglen_t = ::c_ulong;
 pub type nfds_t = ::c_ulong;
 pub type nl_item = ::c_int;
+pub type idtype_t = ::c_uint;
 
 pub enum fpos64_t {} // TODO: fill this out with a struct
 

diff --git a/src/unix/notbsd/mod.rs b/src/unix/notbsd/mod.rs
@@ -9,18 +9,6 @@ pub type clockid_t = ::c_int;
 pub type key_t = ::c_int;
 pub type id_t = ::c_uint;
 
-// idtype_t is specified as a C enum:
-// http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/sys_wait.h.html
-// However, FFI doesn't currently know how to ABI-match a C enum
-// (rust#28925, rust#34641).
-cfg_if! {
-    if #[cfg(target_os = "android")] {
-        pub type idtype_t = ::c_int;
-    } else {
-        pub type idtype_t = ::c_uint;
-    }
-}
-
 pub enum timezone {}
 
 s! {

diff --git a/src/unix/solaris/mod.rs b/src/unix/solaris/mod.rs
@@ -33,11 +33,6 @@ pub type blksize_t = u32;
 pub type fflags_t = u32;
 pub type nl_item = ::c_int;
 pub type id_t = ::c_int;
-
-// idtype_t is specified as a C enum:
-// http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/sys_wait.h.html
-// However, FFI doesn't currently know how to ABI-match a C enum
-// (rust#28925, rust#34641).
 pub type idtype_t = ::c_uint;
 
 pub enum timezone {}