Skip to content

Commit

Permalink
xrOS support
Browse files Browse the repository at this point in the history
Swapped to visionOS target_os

(apply <rust-lang#3568> to `main`)
[ resolve conflicts - Trevor ]
(cherry picked from commit b5b0f69)
  • Loading branch information
agg23 authored and tgross35 committed Aug 28, 2024
1 parent c3d1c72 commit 484ebe8
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 5 deletions.
2 changes: 1 addition & 1 deletion build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const ALLOWED_CFGS: &'static [&'static str] = &[

// Extra values to allow for check-cfg.
const CHECK_CFG_EXTRA: &'static [(&'static str, &'static [&'static str])] = &[
("target_os", &["switch", "aix", "ohos", "hurd"]),
("target_os", &["switch", "aix", "ohos", "hurd", "visionos"]),
("target_env", &["illumos", "wasi", "aix", "ohos"]),
(
"target_arch",
Expand Down
2 changes: 1 addition & 1 deletion src/unix/bsd/apple/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6427,7 +6427,7 @@ cfg_if! {
}
}
cfg_if! {
if #[cfg(any(target_os = "macos", target_os = "ios", target_os = "tvos"))] {
if #[cfg(any(target_os = "macos", target_os = "ios", target_os = "tvos", target_os = "visionos"))] {
extern "C" {
pub fn memmem(
haystack: *const ::c_void,
Expand Down
3 changes: 2 additions & 1 deletion src/unix/bsd/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ s! {
target_os = "ios",
target_os = "tvos",
target_os = "watchos",
target_os = "visionos",
target_os = "netbsd",
target_os = "openbsd")))]
pub pw_fields: ::c_int,
Expand Down Expand Up @@ -924,7 +925,7 @@ cfg_if! {
}

cfg_if! {
if #[cfg(any(target_os = "macos", target_os = "ios", target_os = "tvos", target_os = "watchos"))] {
if #[cfg(any(target_os = "macos", target_os = "ios", target_os = "tvos", target_os = "watchos", target_os = "visionos"))] {
mod apple;
pub use self::apple::*;
} else if #[cfg(any(target_os = "openbsd", target_os = "netbsd"))] {
Expand Down
8 changes: 6 additions & 2 deletions src/unix/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,7 @@ cfg_if! {
target_os = "ios",
target_os = "tvos",
target_os = "watchos",
target_os = "visionos",
target_os = "android",
target_os = "openbsd",
target_os = "nto",
Expand Down Expand Up @@ -1043,7 +1044,8 @@ extern "C" {
target_os = "macos",
target_os = "ios",
target_os = "tvos",
target_os = "watchos"
target_os = "watchos",
target_os = "visionos"
),
link_name = "realpath$DARWIN_EXTSN"
)]
Expand Down Expand Up @@ -1218,7 +1220,8 @@ extern "C" {
target_os = "macos",
target_os = "ios",
target_os = "tvos",
target_os = "watchos"
target_os = "watchos",
target_os = "visionos"
),
link_name = "res_9_init"
)]
Expand Down Expand Up @@ -1581,6 +1584,7 @@ cfg_if! {
target_os = "ios",
target_os = "tvos",
target_os = "watchos",
target_os = "visionos",
target_os = "freebsd",
target_os = "dragonfly",
target_os = "openbsd",
Expand Down

0 comments on commit 484ebe8

Please sign in to comment.