File tree 7 files changed +2
-37
lines changed
7 files changed +2
-37
lines changed Original file line number Diff line number Diff line change @@ -9,11 +9,6 @@ pub type sem_t = _sem;
9
9
10
10
pub type fsblkcnt_t = :: uint64_t ;
11
11
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).
17
12
pub type idtype_t = :: c_uint ;
18
13
19
14
s ! {
Original file line number Diff line number Diff line change @@ -4,11 +4,6 @@ pub type dev_t = u64;
4
4
pub type blksize_t = :: int32_t ;
5
5
pub type fsblkcnt_t = :: uint64_t ;
6
6
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).
12
7
pub type idtype_t = :: c_int ;
13
8
14
9
s ! {
@@ -673,11 +668,6 @@ extern {
673
668
pub fn newlocale ( mask : :: c_int ,
674
669
locale : * const :: c_char ,
675
670
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;
681
671
}
682
672
683
673
mod other;
Original file line number Diff line number Diff line change @@ -29,11 +29,6 @@ pub type fsfilcnt_t = i64;
29
29
pub type pthread_attr_t = * mut :: c_void ;
30
30
pub type nl_item = :: c_int ;
31
31
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).
37
32
pub type idtype_t = :: c_uint ;
38
33
39
34
pub enum timezone { }
Original file line number Diff line number Diff line change @@ -25,6 +25,7 @@ pub type rlim_t = ::c_ulong;
25
25
pub type dev_t = :: c_ulong ;
26
26
pub type ino_t = :: c_ulong ;
27
27
pub type __CPU_BITTYPE = :: c_ulong ;
28
+ pub type idtype_t = :: c_int ;
28
29
29
30
s ! {
30
31
pub struct dirent {
Original file line number Diff line number Diff line change @@ -17,6 +17,7 @@ pub type msgqnum_t = ::c_ulong;
17
17
pub type msglen_t = :: c_ulong ;
18
18
pub type nfds_t = :: c_ulong ;
19
19
pub type nl_item = :: c_int ;
20
+ pub type idtype_t = :: c_uint ;
20
21
21
22
pub enum fpos64_t { } // TODO: fill this out with a struct
22
23
Original file line number Diff line number Diff line change @@ -9,18 +9,6 @@ pub type clockid_t = ::c_int;
9
9
pub type key_t = :: c_int ;
10
10
pub type id_t = :: c_uint ;
11
11
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
-
24
12
pub enum timezone { }
25
13
26
14
s ! {
Original file line number Diff line number Diff line change @@ -33,11 +33,6 @@ pub type blksize_t = u32;
33
33
pub type fflags_t = u32 ;
34
34
pub type nl_item = :: c_int ;
35
35
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).
41
36
pub type idtype_t = :: c_uint ;
42
37
43
38
pub enum timezone { }
You can’t perform that action at this time.
0 commit comments