diff options
author | bors <bors@rust-lang.org> | 2022-10-18 10:20:22 +0000 |
---|---|---|
committer | bors <bors@rust-lang.org> | 2022-10-18 10:20:22 +0000 |
commit | ce0d4079b249c612c9a9ed95dbd1bb40e2080713 (patch) | |
tree | df14fd85ab1c9f58ec932a467b7428b2a5c84cd8 | |
parent | 998e88630ebbdceda33774cd6531335254f9769b (diff) | |
parent | 3edc2a3e339c2b5c6af4afaf85c61375b7ad1899 (diff) | |
download | rust-libc-ce0d4079b249c612c9a9ed95dbd1bb40e2080713.tar.gz |
Auto merge of #2970 - pfmooney:solarish-libsendfile, r=JohnTitor
solarish: Fix libsendfile symbol dependency
A number of function symbols were erroneously grouped under the `libsendfile` link section. This should correct the situation.
-rw-r--r-- | src/unix/solarish/mod.rs | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/unix/solarish/mod.rs b/src/unix/solarish/mod.rs index c5da62be04..d01deefbf3 100644 --- a/src/unix/solarish/mod.rs +++ b/src/unix/solarish/mod.rs @@ -3147,18 +3147,7 @@ extern "C" { pub fn sysinfo(command: ::c_int, buf: *mut ::c_char, count: ::c_long) -> ::c_int; pub fn faccessat(fd: ::c_int, path: *const ::c_char, amode: ::c_int, flag: ::c_int) -> ::c_int; -} -#[link(name = "sendfile")] -extern "C" { - pub fn sendfile(out_fd: ::c_int, in_fd: ::c_int, off: *mut ::off_t, len: ::size_t) - -> ::ssize_t; - pub fn sendfilev( - fildes: ::c_int, - vec: *const sendfilevec_t, - sfvcnt: ::c_int, - xferred: *mut ::size_t, - ) -> ::ssize_t; // #include <link.h> #[cfg(any(target_arch = "x86", target_arch = "x86_64"))] pub fn dl_iterate_phdr( @@ -3205,6 +3194,18 @@ extern "C" { pub fn backtrace_symbols_fd(buffer: *const *mut ::c_void, size: ::c_int, fd: ::c_int); } +#[link(name = "sendfile")] +extern "C" { + pub fn sendfile(out_fd: ::c_int, in_fd: ::c_int, off: *mut ::off_t, len: ::size_t) + -> ::ssize_t; + pub fn sendfilev( + fildes: ::c_int, + vec: *const sendfilevec_t, + sfvcnt: ::c_int, + xferred: *mut ::size_t, + ) -> ::ssize_t; +} + #[link(name = "lgrp")] extern "C" { pub fn lgrp_init(view: lgrp_view_t) -> lgrp_cookie_t; |