Skip to content

Commit 5b59dbd

Browse files
authored
Rollup merge of #143668 - biabbas:vxworks, r=Noratrieb
Fix VxWorks build errors fixes #143442 r? `@Noratrieb`
2 parents 93ab533 + 6637335 commit 5b59dbd

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

library/std/src/sys/fs/unix.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1491,7 +1491,6 @@ impl File {
14911491
target_os = "redox",
14921492
target_os = "espidf",
14931493
target_os = "horizon",
1494-
target_os = "vxworks",
14951494
target_os = "nuttx",
14961495
)))]
14971496
let to_timespec = |time: Option<SystemTime>| match time {

library/std/src/sys/pal/unix/thread.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ impl Thread {
222222

223223
#[cfg(target_os = "vxworks")]
224224
pub fn set_name(name: &CStr) {
225-
let mut name = truncate_cstr::<{ libc::VX_TASK_RENAME_LENGTH - 1 }>(name);
225+
let mut name = truncate_cstr::<{ (libc::VX_TASK_RENAME_LENGTH - 1) as usize }>(name);
226226
let res = unsafe { libc::taskNameSet(libc::taskIdSelf(), name.as_mut_ptr()) };
227227
debug_assert_eq!(res, libc::OK);
228228
}

0 commit comments

Comments
 (0)