Skip to content

Commit e4e865d

Browse files
committed
Auto merge of #2958 - thomcc:tvos-support, r=JohnTitor
Add support for tvOS This is essentially identical to the iOS support, as the OS is... essentially identical to iOS.
2 parents 9960e1c + bf618c9 commit e4e865d

File tree

2 files changed

+16
-3
lines changed

2 files changed

+16
-3
lines changed

src/unix/bsd/mod.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ s! {
3737

3838
#[cfg(not(any(target_os = "macos",
3939
target_os = "ios",
40+
target_os = "tvos",
4041
target_os = "watchos",
4142
target_os = "netbsd",
4243
target_os = "openbsd")))]
@@ -887,7 +888,7 @@ extern "C" {
887888
}
888889

889890
cfg_if! {
890-
if #[cfg(any(target_os = "macos", target_os = "ios", target_os = "watchos"))] {
891+
if #[cfg(any(target_os = "macos", target_os = "ios", target_os = "tvos", target_os = "watchos"))] {
891892
mod apple;
892893
pub use self::apple::*;
893894
} else if #[cfg(any(target_os = "openbsd", target_os = "netbsd"))] {

src/unix/mod.rs

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,7 @@ cfg_if! {
356356
extern {}
357357
} else if #[cfg(any(target_os = "macos",
358358
target_os = "ios",
359+
target_os = "tvos",
359360
target_os = "watchos",
360361
target_os = "android",
361362
target_os = "openbsd"))] {
@@ -1030,7 +1031,12 @@ extern "C" {
10301031
pub fn getrusage(resource: ::c_int, usage: *mut rusage) -> ::c_int;
10311032

10321033
#[cfg_attr(
1033-
any(target_os = "macos", target_os = "ios", target_os = "watchos"),
1034+
any(
1035+
target_os = "macos",
1036+
target_os = "ios",
1037+
target_os = "tvos",
1038+
target_os = "watchos"
1039+
),
10341040
link_name = "realpath$DARWIN_EXTSN"
10351041
)]
10361042
pub fn realpath(pathname: *const ::c_char, resolved: *mut ::c_char) -> *mut ::c_char;
@@ -1197,7 +1203,12 @@ extern "C" {
11971203
link_name = "__res_init"
11981204
)]
11991205
#[cfg_attr(
1200-
any(target_os = "macos", target_os = "ios", target_os = "watchos"),
1206+
any(
1207+
target_os = "macos",
1208+
target_os = "ios",
1209+
target_os = "tvos",
1210+
target_os = "watchos"
1211+
),
12011212
link_name = "res_9_init"
12021213
)]
12031214
pub fn res_init() -> ::c_int;
@@ -1483,6 +1494,7 @@ cfg_if! {
14831494
pub use self::linux_like::*;
14841495
} else if #[cfg(any(target_os = "macos",
14851496
target_os = "ios",
1497+
target_os = "tvos",
14861498
target_os = "watchos",
14871499
target_os = "freebsd",
14881500
target_os = "dragonfly",

0 commit comments

Comments
 (0)