Skip to content

Commit 436f446

Browse files
authored
Merge pull request #3835 from tgross35/revert-bsd-getnameinfo-0.2
Revert "openbsd/netbsd factorise getnameinfo."
2 parents ecc37eb + 3552676 commit 436f446

File tree

3 files changed

+18
-11
lines changed

3 files changed

+18
-11
lines changed

src/unix/bsd/netbsdlike/mod.rs

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

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

+9
Original file line numberDiff line numberDiff line change
@@ -2648,6 +2648,15 @@ extern "C" {
26482648
pub fn lutimes(file: *const ::c_char, times: *const ::timeval) -> ::c_int;
26492649
#[link_name = "__gettimeofday50"]
26502650
pub fn gettimeofday(tp: *mut ::timeval, tz: *mut ::c_void) -> ::c_int;
2651+
pub fn getnameinfo(
2652+
sa: *const ::sockaddr,
2653+
salen: ::socklen_t,
2654+
host: *mut ::c_char,
2655+
hostlen: ::socklen_t,
2656+
serv: *mut ::c_char,
2657+
servlen: ::socklen_t,
2658+
flags: ::c_int,
2659+
) -> ::c_int;
26512660
pub fn mprotect(addr: *mut ::c_void, len: ::size_t, prot: ::c_int) -> ::c_int;
26522661
pub fn sysctl(
26532662
name: *const ::c_int,

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

+9
Original file line numberDiff line numberDiff line change
@@ -2018,6 +2018,15 @@ extern "C" {
20182018
atflag: ::c_int,
20192019
) -> ::c_int;
20202020
pub fn dirfd(dirp: *mut ::DIR) -> ::c_int;
2021+
pub fn getnameinfo(
2022+
sa: *const ::sockaddr,
2023+
salen: ::socklen_t,
2024+
host: *mut ::c_char,
2025+
hostlen: ::size_t,
2026+
serv: *mut ::c_char,
2027+
servlen: ::size_t,
2028+
flags: ::c_int,
2029+
) -> ::c_int;
20212030
pub fn getresgid(rgid: *mut ::gid_t, egid: *mut ::gid_t, sgid: *mut ::gid_t) -> ::c_int;
20222031
pub fn getresuid(ruid: *mut ::uid_t, euid: *mut ::uid_t, suid: *mut ::uid_t) -> ::c_int;
20232032
pub fn kevent(

0 commit comments

Comments
 (0)