Skip to content

Commit 01c72ee

Browse files
kleisauketgross35
authored andcommitted
emscripten: Remove aio.h usage
See: emscripten-core/emscripten@6416c35.
1 parent c025f57 commit 01c72ee

File tree

2 files changed

+1
-31
lines changed

2 files changed

+1
-31
lines changed

libc-test/build.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2739,7 +2739,6 @@ fn test_emscripten(target: &str) {
27392739
cfg.define("_GNU_SOURCE", None); // FIXME: ??
27402740

27412741
headers! { cfg:
2742-
"aio.h",
27432742
"ctype.h",
27442743
"dirent.h",
27452744
"dlfcn.h",
@@ -2964,10 +2963,7 @@ fn test_emscripten(target: &str) {
29642963
(struct_ == "sigaction" && field == "sa_sigaction") ||
29652964
// sigval is actually a union, but we pretend it's a struct
29662965
// FIXME: is this necessary?
2967-
(struct_ == "sigevent" && field == "sigev_value") ||
2968-
// aio_buf is "volatile void*" and Rust doesn't understand volatile
2969-
// FIXME: is this necessary?
2970-
(struct_ == "aiocb" && field == "aio_buf")
2966+
(struct_ == "sigevent" && field == "sigev_value")
29712967
});
29722968

29732969
cfg.skip_field(move |struct_, field| {

src/unix/linux_like/emscripten/mod.rs

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -171,23 +171,6 @@ s! {
171171
pub sem_flg: ::c_short,
172172
}
173173

174-
pub struct aiocb {
175-
pub aio_fildes: ::c_int,
176-
pub aio_lio_opcode: ::c_int,
177-
pub aio_reqprio: ::c_int,
178-
pub aio_buf: *mut ::c_void,
179-
pub aio_nbytes: ::size_t,
180-
pub aio_sigevent: ::sigevent,
181-
__td: *mut ::c_void,
182-
__lock: [::c_int; 2],
183-
__err: ::c_int,
184-
__ret: ::ssize_t,
185-
pub aio_offset: off_t,
186-
__next: *mut ::c_void,
187-
__prev: *mut ::c_void,
188-
__dummy4: [::c_char; 24],
189-
}
190-
191174
pub struct sigaction {
192175
pub sa_sigaction: ::sighandler_t,
193176
pub sa_mask: ::sigset_t,
@@ -915,15 +898,6 @@ pub const SYNC_FILE_RANGE_WAIT_AFTER: ::c_uint = 4;
915898

916899
pub const EAI_SYSTEM: ::c_int = -11;
917900

918-
pub const AIO_CANCELED: ::c_int = 0;
919-
pub const AIO_NOTCANCELED: ::c_int = 1;
920-
pub const AIO_ALLDONE: ::c_int = 2;
921-
pub const LIO_READ: ::c_int = 0;
922-
pub const LIO_WRITE: ::c_int = 1;
923-
pub const LIO_NOP: ::c_int = 2;
924-
pub const LIO_WAIT: ::c_int = 0;
925-
pub const LIO_NOWAIT: ::c_int = 1;
926-
927901
pub const MREMAP_MAYMOVE: ::c_int = 1;
928902
pub const MREMAP_FIXED: ::c_int = 2;
929903

0 commit comments

Comments
 (0)