Skip to content

Commit e53cf4f

Browse files
committed
Auto merge of #2775 - asomers:aio_writev2, r=Amanieu
Enable aio_{read,write}v on FreeBSD When I originally added these symbols, I put them in the freebsd13 module. But I needn't have, since they didn't change any existing symbols. Instead, as totally new symbols, they should've gone into the freebsd module. This way they can actually be used.
2 parents 9a6c13a + fb965d3 commit e53cf4f

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

libc-test/build.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2355,6 +2355,8 @@ fn test_freebsd(target: &str) {
23552355

23562356
// Added in FreeBSD 13.
23572357
"getlocalbase" if Some(13) > freebsd_ver => true,
2358+
"aio_readv" if Some(13) > freebsd_ver => true,
2359+
"aio_writev" if Some(13) > freebsd_ver => true,
23582360

23592361
_ => false,
23602362
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -469,8 +469,6 @@ pub const DOMAINSET_POLICY_INTERLEAVE: ::c_int = 4;
469469
pub const MINCORE_SUPER: ::c_int = 0x20;
470470

471471
extern "C" {
472-
pub fn aio_readv(aiocbp: *mut ::aiocb) -> ::c_int;
473-
pub fn aio_writev(aiocbp: *mut ::aiocb) -> ::c_int;
474472
pub fn setgrent();
475473
pub fn mprotect(addr: *mut ::c_void, len: ::size_t, prot: ::c_int) -> ::c_int;
476474
pub fn freelocale(loc: ::locale_t);

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -469,8 +469,6 @@ pub const DOMAINSET_POLICY_INTERLEAVE: ::c_int = 4;
469469
pub const MINCORE_SUPER: ::c_int = 0x60;
470470

471471
extern "C" {
472-
pub fn aio_readv(aiocbp: *mut ::aiocb) -> ::c_int;
473-
pub fn aio_writev(aiocbp: *mut ::aiocb) -> ::c_int;
474472
pub fn setgrent();
475473
pub fn mprotect(addr: *mut ::c_void, len: ::size_t, prot: ::c_int) -> ::c_int;
476474
pub fn freelocale(loc: ::locale_t);

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3840,13 +3840,15 @@ extern "C" {
38403840
pub fn aio_error(aiocbp: *const aiocb) -> ::c_int;
38413841
pub fn aio_fsync(op: ::c_int, aiocbp: *mut aiocb) -> ::c_int;
38423842
pub fn aio_read(aiocbp: *mut aiocb) -> ::c_int;
3843+
pub fn aio_readv(aiocbp: *mut ::aiocb) -> ::c_int;
38433844
pub fn aio_return(aiocbp: *mut aiocb) -> ::ssize_t;
38443845
pub fn aio_suspend(
38453846
aiocb_list: *const *const aiocb,
38463847
nitems: ::c_int,
38473848
timeout: *const ::timespec,
38483849
) -> ::c_int;
38493850
pub fn aio_write(aiocbp: *mut aiocb) -> ::c_int;
3851+
pub fn aio_writev(aiocbp: *mut ::aiocb) -> ::c_int;
38503852

38513853
pub fn devname_r(
38523854
dev: ::dev_t,

0 commit comments

Comments
 (0)