Skip to content

Commit

Permalink
Auto merge of #2970 - pfmooney:solarish-libsendfile, r=JohnTitor
Browse files Browse the repository at this point in the history
solarish: Fix libsendfile symbol dependency

A number of function symbols were erroneously grouped under the `libsendfile` link section.  This should correct the situation.
  • Loading branch information
bors committed Oct 18, 2022
2 parents 998e886 + 3edc2a3 commit ce0d407
Showing 1 changed file with 12 additions and 11 deletions.
23 changes: 12 additions & 11 deletions src/unix/solarish/mod.rs
Expand Up @@ -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(
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit ce0d407

Please sign in to comment.