Skip to content

Commit 8281157

Browse files
committed
Use xnet sockets functions as Illumos already does
1 parent c367aa6 commit 8281157

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

src/unix/mod.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -591,6 +591,7 @@ extern "C" {
591591
#[cfg(not(all(target_arch = "powerpc", target_vendor = "nintendo")))]
592592
#[cfg_attr(target_os = "netbsd", link_name = "__socket30")]
593593
#[cfg_attr(target_os = "illumos", link_name = "__xnet_socket")]
594+
#[cfg_attr(target_os = "solaris", link_name = "__xnet_socket")]
594595
#[cfg_attr(target_os = "espidf", link_name = "lwip_socket")]
595596
pub fn socket(domain: ::c_int, ty: ::c_int, protocol: ::c_int) -> ::c_int;
596597
#[cfg(not(all(target_arch = "powerpc", target_vendor = "nintendo")))]
@@ -599,6 +600,7 @@ extern "C" {
599600
link_name = "connect$UNIX2003"
600601
)]
601602
#[cfg_attr(target_os = "illumos", link_name = "__xnet_connect")]
603+
#[cfg_attr(target_os = "solaris", link_name = "__xnet_connect")]
602604
#[cfg_attr(target_os = "espidf", link_name = "lwip_connect")]
603605
pub fn connect(socket: ::c_int, address: *const sockaddr, len: socklen_t) -> ::c_int;
604606
#[cfg_attr(
@@ -649,6 +651,7 @@ extern "C" {
649651
link_name = "socketpair$UNIX2003"
650652
)]
651653
#[cfg_attr(target_os = "illumos", link_name = "__xnet_socketpair")]
654+
#[cfg_attr(target_os = "solaris", link_name = "__xnet_socketpair")]
652655
pub fn socketpair(
653656
domain: ::c_int,
654657
type_: ::c_int,
@@ -661,6 +664,7 @@ extern "C" {
661664
link_name = "sendto$UNIX2003"
662665
)]
663666
#[cfg_attr(target_os = "illumos", link_name = "__xnet_sendto")]
667+
#[cfg_attr(target_os = "solaris", link_name = "__xnet_sendto")]
664668
#[cfg_attr(target_os = "espidf", link_name = "lwip_sendto")]
665669
pub fn sendto(
666670
socket: ::c_int,
@@ -1138,6 +1142,7 @@ extern "C" {
11381142
pub fn pthread_rwlockattr_destroy(attr: *mut pthread_rwlockattr_t) -> ::c_int;
11391143

11401144
#[cfg_attr(target_os = "illumos", link_name = "__xnet_getsockopt")]
1145+
#[cfg_attr(target_os = "solaris", link_name = "__xnet_getsockopt")]
11411146
#[cfg_attr(target_os = "espidf", link_name = "lwip_getsockopt")]
11421147
pub fn getsockopt(
11431148
sockfd: ::c_int,
@@ -1157,6 +1162,7 @@ extern "C" {
11571162

11581163
#[cfg(not(all(target_arch = "powerpc", target_vendor = "nintendo")))]
11591164
#[cfg_attr(target_os = "illumos", link_name = "__xnet_getaddrinfo")]
1165+
#[cfg_attr(target_os = "solaris", link_name = "__xnet_getaddrinfo")]
11601166
#[cfg_attr(target_os = "espidf", link_name = "lwip_getaddrinfo")]
11611167
pub fn getaddrinfo(
11621168
node: *const c_char,

src/unix/solarish/mod.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2874,15 +2874,19 @@ extern "C" {
28742874
pub fn nl_langinfo(item: ::nl_item) -> *mut ::c_char;
28752875

28762876
#[cfg_attr(target_os = "illumos", link_name = "__xnet_bind")]
2877+
#[cfg_attr(target_os = "solaris", link_name = "__xnet_bind")]
28772878
pub fn bind(socket: ::c_int, address: *const ::sockaddr, address_len: ::socklen_t) -> ::c_int;
28782879

28792880
pub fn writev(fd: ::c_int, iov: *const ::iovec, iovcnt: ::c_int) -> ::ssize_t;
28802881
pub fn readv(fd: ::c_int, iov: *const ::iovec, iovcnt: ::c_int) -> ::ssize_t;
28812882

28822883
#[cfg_attr(target_os = "illumos", link_name = "__xnet_sendmsg")]
2884+
#[cfg_attr(target_os = "solaris", link_name = "__xnet_sendmsg")]
28832885
pub fn sendmsg(fd: ::c_int, msg: *const ::msghdr, flags: ::c_int) -> ::ssize_t;
28842886
#[cfg_attr(target_os = "illumos", link_name = "__xnet_recvmsg")]
2887+
#[cfg_attr(target_os = "solaris", link_name = "__xnet_recvmsg")]
28852888
pub fn recvmsg(fd: ::c_int, msg: *mut ::msghdr, flags: ::c_int) -> ::ssize_t;
2889+
28862890
pub fn accept4(
28872891
fd: ::c_int,
28882892
address: *mut sockaddr,

0 commit comments

Comments
 (0)