about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2023-09-13 18:37:44 +0200
committerGitHub <noreply@github.com>2023-09-13 18:37:44 +0200
commit156f50bef4945846fd29aabe808abcc46517b02e (patch)
tree8363d190a77e7677c961d5f88e3adb9a13b49cee
parent48d89a87595230599579e1cf6d2c5b3f085dd034 (diff)
parent41ee874fa9dad0765da5681092fec25247c1f64d (diff)
downloadrust-156f50bef4945846fd29aabe808abcc46517b02e.tar.gz
rust-156f50bef4945846fd29aabe808abcc46517b02e.zip
Rollup merge of #115816 - vita-rust:vita, r=cuviper
Disabled socketpair for Vita

There is no `socketpair` syscall in Vita newlib. This is reflected in a rust-lang/libc#3284, in which this method is removed for vita target.

Also, we would need the fixes from the abovementioned PR for sockets in std (previously we had some incorrect constant values),  but that can be done separately when rust-lang/libc#3284 is reviewed, merged, and released.
-rw-r--r--library/std/src/sys/unix/net.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/library/std/src/sys/unix/net.rs b/library/std/src/sys/unix/net.rs
index ade8c75a657..48f163b6db0 100644
--- a/library/std/src/sys/unix/net.rs
+++ b/library/std/src/sys/unix/net.rs
@@ -102,7 +102,7 @@ impl Socket {
         }
     }
 
-    #[cfg(not(target_os = "vxworks"))]
+    #[cfg(not(any(target_os = "vxworks", target_os = "vita")))]
     pub fn new_pair(fam: c_int, ty: c_int) -> io::Result<(Socket, Socket)> {
         unsafe {
             let mut fds = [0, 0];
@@ -133,7 +133,7 @@ impl Socket {
         }
     }
 
-    #[cfg(target_os = "vxworks")]
+    #[cfg(any(target_os = "vxworks", target_os = "vita"))]
     pub fn new_pair(_fam: c_int, _ty: c_int) -> io::Result<(Socket, Socket)> {
         unimplemented!()
     }