Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for Apple WatchOS #2717

Merged
merged 5 commits into from
Mar 17, 2022
Merged

Add support for Apple WatchOS #2717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
98e5945
[watch_os] add support for Apple WatchOS
vladimir-ea Jun 17, 2021
b5987a2
[watch_os] Fix format
vladimir-ea Mar 8, 2022
cd0c38d
[watch_os] remove clion files ...
vladimir-ea Mar 8, 2022
f073685
[watch_os] remove clion files .. again
vladimir-ea Mar 8, 2022
68c988f
Use target_pointer_width attribute
vladimir-ea Mar 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/unix/bsd/apple/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1172,9 +1172,9 @@ s_no_extra_traits! {
pub ifi_noproto: u64,
pub ifi_recvtiming: u32,
pub ifi_xmittiming: u32,
#[cfg(any(target_arch = "arm", target_arch = "x86"))]
#[cfg(target_pointer_width = "32")]
pub ifi_lastchange: ::timeval,
#[cfg(not(any(target_arch = "arm", target_arch = "x86")))]
#[cfg(not(target_pointer_width = "32"))]
pub ifi_lastchange: timeval32,
}

Expand Down Expand Up @@ -5522,10 +5522,10 @@ extern "C" {
}

cfg_if! {
if #[cfg(any(target_arch = "arm", target_arch = "x86"))] {
if #[cfg(target_pointer_width = "32")] {
mod b32;
pub use self::b32::*;
} else if #[cfg(any(target_arch = "x86_64", target_arch = "aarch64"))] {
} else if #[cfg(target_pointer_width = "64")] {
mod b64;
pub use self::b64::*;
} else {
Expand Down
3 changes: 2 additions & 1 deletion src/unix/bsd/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ s! {

#[cfg(not(any(target_os = "macos",
target_os = "ios",
target_os = "watchos",
target_os = "netbsd",
target_os = "openbsd")))]
pub pw_fields: ::c_int,
Expand Down Expand Up @@ -880,7 +881,7 @@ extern "C" {
}

cfg_if! {
if #[cfg(any(target_os = "macos", target_os = "ios"))] {
if #[cfg(any(target_os = "macos", target_os = "ios", target_os = "watchos"))] {
mod apple;
pub use self::apple::*;
} else if #[cfg(any(target_os = "openbsd", target_os = "netbsd"))] {
Expand Down
9 changes: 7 additions & 2 deletions src/unix/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,7 @@ cfg_if! {
extern {}
} else if #[cfg(any(target_os = "macos",
target_os = "ios",
target_os = "watchos",
target_os = "android",
target_os = "openbsd"))] {
#[link(name = "c")]
Expand Down Expand Up @@ -1017,7 +1018,7 @@ extern "C" {
pub fn getrusage(resource: ::c_int, usage: *mut rusage) -> ::c_int;

#[cfg_attr(
any(target_os = "macos", target_os = "ios"),
any(target_os = "macos", target_os = "ios", target_os = "watchos"),
link_name = "realpath$DARWIN_EXTSN"
)]
pub fn realpath(pathname: *const ::c_char, resolved: *mut ::c_char) -> *mut ::c_char;
Expand Down Expand Up @@ -1183,7 +1184,10 @@ extern "C" {
),
link_name = "__res_init"
)]
#[cfg_attr(any(target_os = "macos", target_os = "ios"), link_name = "res_9_init")]
#[cfg_attr(
any(target_os = "macos", target_os = "ios", target_os = "watchos"),
link_name = "res_9_init"
)]
pub fn res_init() -> ::c_int;

#[cfg_attr(target_os = "netbsd", link_name = "__gmtime_r50")]
Expand Down Expand Up @@ -1456,6 +1460,7 @@ cfg_if! {
pub use self::linux_like::*;
} else if #[cfg(any(target_os = "macos",
target_os = "ios",
target_os = "watchos",
target_os = "freebsd",
target_os = "dragonfly",
target_os = "openbsd",
Expand Down