summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-11-03 15:03:22 +0000
committerbors <bors@rust-lang.org>2018-11-03 15:03:22 +0000
commit9c5e70ae306463a23ec02179ac2c9fe05c3fb44e (patch)
tree9723858392ec733e75184a95f7b12894ec562aa5
parent2045e8e1271cea36e71a09b68cd4efef1e385927 (diff)
parent56fd32966c663fe7e6e1d47484b690e9b0aa30e7 (diff)
downloadrust-libc-9c5e70ae306463a23ec02179ac2c9fe05c3fb44e.tar.gz
Auto merge of #1119 - jakllsch:netbsd-extattr-not-in-libutil, r=alexcrichton
NetBSD: these extattr functions are not in libutil, but libc - extattr_namespace_to_string() - extattr_string_to_namespace()
-rw-r--r--src/unix/bsd/netbsdlike/netbsd/mod.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/unix/bsd/netbsdlike/netbsd/mod.rs b/src/unix/bsd/netbsdlike/netbsd/mod.rs
index 7cdd868996..4ceb4ee9d5 100644
--- a/src/unix/bsd/netbsdlike/netbsd/mod.rs
+++ b/src/unix/bsd/netbsdlike/netbsd/mod.rs
@@ -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,
@@ -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;
@@ -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,