Add tvOS and watchOS

Follow up to commit 28c02ca.
rust-lang · Feb 25, 2023 · d1be18d · d1be18d
1 parent 765003a
commit d1be18d
Show file tree

Hide file tree

Showing 5 changed files with 210 additions and 22 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -477,6 +477,8 @@ impl TcpKeepalive {
         target_os = "linux",
         target_os = "macos",
         target_os = "netbsd",
+        target_os = "tvos",
+        target_os = "watchos",
         target_os = "windows",
     ))]
     #[cfg_attr(
@@ -491,6 +493,8 @@ impl TcpKeepalive {
             target_os = "linux",
             target_os = "macos",
             target_os = "netbsd",
+            target_os = "tvos",
+            target_os = "watchos",
             target_os = "windows",
         )))
     )]
@@ -517,6 +521,8 @@ impl TcpKeepalive {
             target_os = "linux",
             target_os = "macos",
             target_os = "netbsd",
+            target_os = "tvos",
+            target_os = "watchos",
         )
     ))]
     #[cfg_attr(
@@ -533,6 +539,8 @@ impl TcpKeepalive {
                 target_os = "linux",
                 target_os = "macos",
                 target_os = "netbsd",
+                target_os = "tvos",
+                target_os = "watchos",
             )
         )))
     )]

diff --git a/src/sockaddr.rs b/src/sockaddr.rs
@@ -303,9 +303,11 @@ impl fmt::Debug for SockAddr {
             target_os = "ios",
             target_os = "macos",
             target_os = "netbsd",
+            target_os = "nto",
             target_os = "openbsd",
+            target_os = "tvos",
             target_os = "vxworks",
-            target_os = "nto",
+            target_os = "watchos",
         ))]
         f.field("ss_len", &self.storage.ss_len);
         f.field("ss_family", &self.storage.ss_family)

diff --git a/src/socket.rs b/src/socket.rs
@@ -770,7 +770,12 @@ fn set_common_flags(socket: Socket) -> io::Result<Socket> {
     socket._set_cloexec(true)?;
 
     // On Apple platforms set `NOSIGPIPE`.
-    #[cfg(any(target_os = "ios", target_os = "macos"))]
+    #[cfg(any(
+        target_os = "ios",
+        target_os = "macos",
+        target_os = "tvos",
+        target_os = "watchos",
+    ))]
     socket._set_nosigpipe(true)?;
 
     Ok(socket)
@@ -1798,6 +1803,8 @@ impl Socket {
             target_os = "linux",
             target_os = "macos",
             target_os = "netbsd",
+            target_os = "tvos",
+            target_os = "watchos",
         )
     ))]
     #[cfg_attr(
@@ -1814,6 +1821,8 @@ impl Socket {
                 target_os = "linux",
                 target_os = "macos",
                 target_os = "netbsd",
+                target_os = "tvos",
+                target_os = "watchos",
             )
         )))
     )]
@@ -1841,6 +1850,8 @@ impl Socket {
             target_os = "linux",
             target_os = "macos",
             target_os = "netbsd",
+            target_os = "tvos",
+            target_os = "watchos",
         )
     ))]
     #[cfg_attr(
@@ -1857,6 +1868,8 @@ impl Socket {
                 target_os = "linux",
                 target_os = "macos",
                 target_os = "netbsd",
+                target_os = "tvos",
+                target_os = "watchos",
             )
         )))
     )]