Skip to content

Commit 984fb54

Browse files
committed
Changes requested by reviewers
1 parent f05e48c commit 984fb54

File tree

7 files changed

+2
-37
lines changed

7 files changed

+2
-37
lines changed

src/unix/bsd/freebsdlike/freebsd/mod.rs

-5
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@ pub type sem_t = _sem;
99

1010
pub type fsblkcnt_t = ::uint64_t;
1111
pub type fsfilcnt_t = ::uint64_t;
12-
13-
// idtype_t is specified as a C enum:
14-
// http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/sys_wait.h.html
15-
// However, FFI doesn't currently know how to ABI-match a C enum
16-
// (rust#28925, rust#34641).
1712
pub type idtype_t = ::c_uint;
1813

1914
s! {

src/unix/bsd/netbsdlike/netbsd/mod.rs

-10
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,6 @@ pub type dev_t = u64;
44
pub type blksize_t = ::int32_t;
55
pub type fsblkcnt_t = ::uint64_t;
66
pub type fsfilcnt_t = ::uint64_t;
7-
8-
// idtype_t is specified as a C enum:
9-
// http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/sys_wait.h.html
10-
// However, FFI doesn't currently know how to ABI-match a C enum
11-
// (rust#28925, rust#34641).
127
pub type idtype_t = ::c_int;
138

149
s! {
@@ -673,11 +668,6 @@ extern {
673668
pub fn newlocale(mask: ::c_int,
674669
locale: *const ::c_char,
675670
base: ::locale_t) -> ::locale_t;
676-
677-
// This should work, but it causes the netbsd CI build to fail with an
678-
// intra-libc.a undefined reference to `wait6`.
679-
//pub fn waitid(idtype: idtype_t, id: id_t, infop: *mut ::siginfo_t,
680-
// options: ::c_int) -> ::c_int;
681671
}
682672

683673
mod other;

src/unix/haiku/mod.rs

-5
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,6 @@ pub type fsfilcnt_t = i64;
2929
pub type pthread_attr_t = *mut ::c_void;
3030
pub type nl_item = ::c_int;
3131
pub type id_t = i32;
32-
33-
// idtype_t is specified as a C enum:
34-
// http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/sys_wait.h.html
35-
// However, FFI doesn't currently know how to ABI-match a C enum
36-
// (rust#28925, rust#34641).
3732
pub type idtype_t = ::c_uint;
3833

3934
pub enum timezone {}

src/unix/notbsd/android/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ pub type rlim_t = ::c_ulong;
2525
pub type dev_t = ::c_ulong;
2626
pub type ino_t = ::c_ulong;
2727
pub type __CPU_BITTYPE = ::c_ulong;
28+
pub type idtype_t = ::c_int;
2829

2930
s! {
3031
pub struct dirent {

src/unix/notbsd/linux/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ pub type msgqnum_t = ::c_ulong;
1717
pub type msglen_t = ::c_ulong;
1818
pub type nfds_t = ::c_ulong;
1919
pub type nl_item = ::c_int;
20+
pub type idtype_t = ::c_uint;
2021

2122
pub enum fpos64_t {} // TODO: fill this out with a struct
2223

src/unix/notbsd/mod.rs

-12
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,6 @@ pub type clockid_t = ::c_int;
99
pub type key_t = ::c_int;
1010
pub type id_t = ::c_uint;
1111

12-
// idtype_t is specified as a C enum:
13-
// http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/sys_wait.h.html
14-
// However, FFI doesn't currently know how to ABI-match a C enum
15-
// (rust#28925, rust#34641).
16-
cfg_if! {
17-
if #[cfg(target_os = "android")] {
18-
pub type idtype_t = ::c_int;
19-
} else {
20-
pub type idtype_t = ::c_uint;
21-
}
22-
}
23-
2412
pub enum timezone {}
2513

2614
s! {

src/unix/solaris/mod.rs

-5
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,6 @@ pub type blksize_t = u32;
3333
pub type fflags_t = u32;
3434
pub type nl_item = ::c_int;
3535
pub type id_t = ::c_int;
36-
37-
// idtype_t is specified as a C enum:
38-
// http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/sys_wait.h.html
39-
// However, FFI doesn't currently know how to ABI-match a C enum
40-
// (rust#28925, rust#34641).
4136
pub type idtype_t = ::c_uint;
4237

4338
pub enum timezone {}

0 commit comments

Comments
 (0)