Add tvOS and watchOS

Follow up to 98915ad.
tokio-rs · Feb 25, 2023 · 584e8f2 · 584e8f2
1 parent c45510f
commit 584e8f2
Show file tree

Hide file tree

Showing 13 changed files with 309 additions and 46 deletions.
diff --git a/src/interest.rs b/src/interest.rs
@@ -37,6 +37,8 @@ impl Interest {
         target_os = "freebsd",
         target_os = "ios",
         target_os = "macos",
+        target_os = "tvos",
+        target_os = "watchos",
     ))]
     pub const AIO: Interest = Interest(unsafe { NonZeroU8::new_unchecked(AIO) });
 
@@ -153,6 +155,8 @@ impl fmt::Debug for Interest {
             target_os = "freebsd",
             target_os = "ios",
             target_os = "macos",
+            target_os = "tvos",
+            target_os = "watchos",
         ))]
         {
             if self.is_aio() {

diff --git a/src/sys/unix/net.rs b/src/sys/unix/net.rs
@@ -27,7 +27,12 @@ pub(crate) fn new_socket(domain: libc::c_int, socket_type: libc::c_int) -> io::R
     let socket = syscall!(socket(domain, socket_type, 0))?;
 
     // Mimick `libstd` and set `SO_NOSIGPIPE` on apple systems.
-    #[cfg(any(target_os = "ios", target_os = "macos"))]
+    #[cfg(any(
+        target_os = "ios",
+        target_os = "macos",
+        target_os = "tvos",
+        target_os = "watchos",
+    ))]
     if let Err(err) = syscall!(setsockopt(
         socket,
         libc::SOL_SOCKET,
@@ -40,7 +45,12 @@ pub(crate) fn new_socket(domain: libc::c_int, socket_type: libc::c_int) -> io::R
     }
 
     // Darwin doesn't have SOCK_NONBLOCK or SOCK_CLOEXEC.
-    #[cfg(any(target_os = "ios", target_os = "macos"))]
+    #[cfg(any(
+        target_os = "ios",
+        target_os = "macos",
+        target_os = "tvos",
+        target_os = "watchos",
+    ))]
     {
         if let Err(err) = syscall!(fcntl(socket, libc::F_SETFL, libc::O_NONBLOCK)) {
             let _ = syscall!(close(socket));
@@ -93,6 +103,8 @@ pub(crate) fn socket_addr(addr: &SocketAddr) -> (SocketAddrCRepr, libc::socklen_
                     target_os = "macos",
                     target_os = "netbsd",
                     target_os = "openbsd",
+                    target_os = "tvos",
+                    target_os = "watchos",
                 ))]
                 sin_len: 0,
             };
@@ -117,6 +129,8 @@ pub(crate) fn socket_addr(addr: &SocketAddr) -> (SocketAddrCRepr, libc::socklen_
                     target_os = "macos",
                     target_os = "netbsd",
                     target_os = "openbsd",
+                    target_os = "tvos",
+                    target_os = "watchos",
                 ))]
                 sin6_len: 0,
                 #[cfg(target_os = "illumos")]

diff --git a/src/sys/unix/pipe.rs b/src/sys/unix/pipe.rs
@@ -163,7 +163,12 @@ pub fn new() -> io::Result<(Sender, Receiver)> {
         }
     }
 
-    #[cfg(any(target_os = "ios", target_os = "macos"))]
+    #[cfg(any(
+        target_os = "ios",
+        target_os = "macos",
+        target_os = "tvos",
+        target_os = "watchos",
+    ))]
     unsafe {
         // For platforms that don't have `pipe2(2)` we need to manually set the
         // correct flags on the file descriptor.
@@ -195,6 +200,8 @@ pub fn new() -> io::Result<(Sender, Receiver)> {
         target_os = "netbsd",
         target_os = "openbsd",
         target_os = "redox",
+        target_os = "tvos",
+        target_os = "watchos",
     )))]
     compile_error!("unsupported target for `mio::unix::pipe`");