diff options
| author | bors <bors@rust-lang.org> | 2025-02-10 11:38:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-02-10 11:38:45 +0000 |
| commit | 8c04e395952022a451138dc4dbead6dd6ae65203 (patch) | |
| tree | ad0062d7c194bb6841e3fa09c09fe6d28c08bdc0 /library/std/src/sys/pal/teeos/thread.rs | |
| parent | 80c091958f05e573433df974f8d2f2bc3a3eadfb (diff) | |
| parent | ffa8a96040b8bb1ae8b856ae2a95159ffe1cb400 (diff) | |
| download | rust-8c04e395952022a451138dc4dbead6dd6ae65203.tar.gz rust-8c04e395952022a451138dc4dbead6dd6ae65203.zip | |
Auto merge of #136809 - workingjubilee:rollup-jk0pew1, r=workingjubilee
Rollup of 12 pull requests Successful merges: - #136053 (coverage: Defer part of counter-creation until codegen) - #136201 (Removed dependency on the field-offset crate, alternate approach) - #136228 (Simplify Rc::as_ptr docs + typo fix) - #136353 (fix(libtest): Enable Instant on Emscripten targets) - #136472 ([`compiletest`-related cleanups 2/7] Feed stage number to compiletest directly) - #136487 (ci: stop mysql before removing it) - #136552 (Use an `Option` for `FindNextFileHandle` in `ReadDir` instead of `INVALID_FILE_HANDLE` sentinel value) - #136705 (Some miscellaneous edition-related library tweaks) - #136707 (Bump `cc` to v1.2.13 for the compiler workspace) - #136790 (Git blame ignore recent formatting commit) - #136792 (Don't apply editorconfig to llvm) - #136805 (ignore win_delete_self test in Miri) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src/sys/pal/teeos/thread.rs')
| -rw-r--r-- | library/std/src/sys/pal/teeos/thread.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/std/src/sys/pal/teeos/thread.rs b/library/std/src/sys/pal/teeos/thread.rs index 15c65240ddd..c779c5f3ed8 100644 --- a/library/std/src/sys/pal/teeos/thread.rs +++ b/library/std/src/sys/pal/teeos/thread.rs @@ -16,7 +16,7 @@ pub struct Thread { unsafe impl Send for Thread {} unsafe impl Sync for Thread {} -extern "C" { +unsafe extern "C" { pub fn TEE_Wait(timeout: u32) -> u32; } |