Skip to content

Commit 2601aa1

Browse files
committed
fix: pass build of libc-test on illumos
1 parent a78476c commit 2601aa1

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

libc-test/build.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -786,6 +786,7 @@ fn test_solarish(target: &str) {
786786

787787
headers! {
788788
cfg:
789+
"aio.h",
789790
"ctype.h",
790791
"dirent.h",
791792
"dlfcn.h",
@@ -948,6 +949,11 @@ fn test_solarish(target: &str) {
948949
}
949950
});
950951

952+
cfg.skip_field_type(move |struct_, field| {
953+
// aio_buf is "volatile void*"
954+
struct_ == "aiocb" && field == "aio_buf"
955+
});
956+
951957
cfg.skip_field(move |s, field| {
952958
match s {
953959
// C99 sizing on this is tough
@@ -1026,6 +1032,9 @@ fn test_solarish(target: &str) {
10261032
// excluded from the tests.
10271033
"getifaddrs" if is_illumos => true,
10281034

1035+
// FIXME: Unsound because `restrict`
1036+
"lio_listio" => true,
1037+
10291038
_ => false,
10301039
}
10311040
});

src/unix/solarish/mod.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ s! {
420420
pub portnfy_user: *mut ::c_void,
421421
}
422422

423-
pub struct aio_result {
423+
pub struct aio_result_t {
424424
aio_return: ::ssize_t,
425425
aio_errno: ::c_int,
426426
}
@@ -433,7 +433,7 @@ s! {
433433
pub aio_reqprio: ::c_int,
434434
pub aio_sigevent: sigevent,
435435
pub aio_lio_opcode: ::c_int,
436-
_aio_resultp: ::aio_result,
436+
_aio_resultp: ::aio_result_t,
437437
_aio_state: ::c_int,
438438
_aio_pad: ::c_int
439439
}
@@ -3075,10 +3075,10 @@ extern "C" {
30753075
) -> ::c_int;
30763076
pub fn aio_waitn(
30773077
aiocb_list: *mut *mut aiocb,
3078-
nent: ::c_int,
3079-
nwait: *mut ::c_int,
3078+
nent: ::c_uint,
3079+
nwait: *mut ::c_uint,
30803080
timeout: *const ::timespec,
3081-
);
3081+
) -> ::c_int;
30823082
pub fn aio_write(aiocbp: *mut aiocb) -> ::c_int;
30833083
pub fn lio_listio(
30843084
mode: ::c_int,

0 commit comments

Comments
 (0)