Skip to content

Commit

Permalink
Auto merge of rust-lang#1119 - jakllsch:netbsd-extattr-not-in-libutil…
Browse files Browse the repository at this point in the history
…, r=alexcrichton

NetBSD: these extattr functions are not in libutil, but libc

 - extattr_namespace_to_string()
 - extattr_string_to_namespace()
  • Loading branch information
bors committed Nov 3, 2018
2 parents 2045e8e + 56fd329 commit 9c5e70a
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/unix/bsd/netbsdlike/netbsd/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1051,6 +1051,8 @@ extern {
attrname: *const ::c_char,
data: *mut ::c_void,
nbytes: ::size_t) -> ::ssize_t;
pub fn extattr_namespace_to_string(attrnamespace: ::c_int,
string: *mut *mut ::c_char) -> ::c_int;
pub fn extattr_set_fd(fd: ::c_int,
attrnamespace: ::c_int,
attrname: *const ::c_char,
Expand All @@ -1066,6 +1068,8 @@ extern {
attrname: *const ::c_char,
data: *const ::c_void,
nbytes: ::size_t) -> ::c_int;
pub fn extattr_string_to_namespace(string: *const ::c_char,
attrnamespace: *mut ::c_int) -> ::c_int;

#[link_name = "__lutimes50"]
pub fn lutimes(file: *const ::c_char, times: *const ::timeval) -> ::c_int;
Expand Down Expand Up @@ -1166,10 +1170,6 @@ extern {

#[link(name = "util")]
extern {
pub fn extattr_namespace_to_string(attrnamespace: ::c_int,
string: *mut *mut ::c_char) -> ::c_int;
pub fn extattr_string_to_namespace(string: *const ::c_char,
attrnamespace: *mut ::c_int) -> ::c_int;
#[cfg_attr(target_os = "netbsd", link_name = "__getpwent_r50")]
pub fn getpwent_r(pwd: *mut ::passwd,
buf: *mut ::c_char,
Expand Down

0 comments on commit 9c5e70a

Please sign in to comment.