Skip to content

Commit fe6ec83

Browse files
committed
Revert "openbsd/netbsd factorise getnameinfo."
This reverts commit 5df9fa0. The change broke builds for OpenBSD. See discussion at <#3822 (comment)>.
1 parent ee173ad commit fe6ec83

File tree

3 files changed

+18
-11
lines changed

3 files changed

+18
-11
lines changed

src/unix/bsd/netbsdlike/mod.rs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -705,17 +705,6 @@ extern "C" {
705705
dev: dev_t,
706706
) -> ::c_int;
707707
pub fn mkfifoat(dirfd: ::c_int, pathname: *const ::c_char, mode: ::mode_t) -> ::c_int;
708-
709-
pub fn getnameinfo(
710-
sa: *const ::sockaddr,
711-
salen: ::socklen_t,
712-
host: *mut ::c_char,
713-
hostlen: ::socklen_t,
714-
serv: *mut ::c_char,
715-
servlen: ::socklen_t,
716-
flags: ::c_int,
717-
) -> ::c_int;
718-
719708
pub fn sem_timedwait(sem: *mut sem_t, abstime: *const ::timespec) -> ::c_int;
720709
pub fn sem_getvalue(sem: *mut sem_t, sval: *mut ::c_int) -> ::c_int;
721710
pub fn pthread_condattr_setclock(

src/unix/bsd/netbsdlike/netbsd/mod.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2626,6 +2626,15 @@ extern "C" {
26262626
pub fn lutimes(file: *const ::c_char, times: *const ::timeval) -> ::c_int;
26272627
#[link_name = "__gettimeofday50"]
26282628
pub fn gettimeofday(tp: *mut ::timeval, tz: *mut ::c_void) -> ::c_int;
2629+
pub fn getnameinfo(
2630+
sa: *const ::sockaddr,
2631+
salen: ::socklen_t,
2632+
host: *mut ::c_char,
2633+
hostlen: ::socklen_t,
2634+
serv: *mut ::c_char,
2635+
servlen: ::socklen_t,
2636+
flags: ::c_int,
2637+
) -> ::c_int;
26292638
pub fn mprotect(addr: *mut ::c_void, len: ::size_t, prot: ::c_int) -> ::c_int;
26302639
pub fn sysctl(
26312640
name: *const ::c_int,

src/unix/bsd/netbsdlike/openbsd/mod.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1983,6 +1983,15 @@ extern "C" {
19831983
atflag: ::c_int,
19841984
) -> ::c_int;
19851985
pub fn dirfd(dirp: *mut ::DIR) -> ::c_int;
1986+
pub fn getnameinfo(
1987+
sa: *const ::sockaddr,
1988+
salen: ::socklen_t,
1989+
host: *mut ::c_char,
1990+
hostlen: ::size_t,
1991+
serv: *mut ::c_char,
1992+
servlen: ::size_t,
1993+
flags: ::c_int,
1994+
) -> ::c_int;
19861995
pub fn getresgid(rgid: *mut ::gid_t, egid: *mut ::gid_t, sgid: *mut ::gid_t) -> ::c_int;
19871996
pub fn getresuid(ruid: *mut ::uid_t, euid: *mut ::uid_t, suid: *mut ::uid_t) -> ::c_int;
19881997
pub fn kevent(

0 commit comments

Comments
 (0)