diff options
| author | Ralf Jung <post@ralfj.de> | 2024-10-13 12:24:54 +0200 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2024-10-13 12:30:23 +0200 |
| commit | 2ae3b1b09a09ec9c034c4cc4ba822b11c2ccbd26 (patch) | |
| tree | 712f0d35588ef8578c56422daf2c7f037e8ed396 | |
| parent | ecf2d1fa4bd8166c696883b10f483122b1fe98a3 (diff) | |
| download | rust-2ae3b1b09a09ec9c034c4cc4ba822b11c2ccbd26.tar.gz rust-2ae3b1b09a09ec9c034c4cc4ba822b11c2ccbd26.zip | |
sys/windows: remove miri hack that is only needed for win7
| -rw-r--r-- | library/std/src/sys/pal/windows/c.rs | 2 | ||||
| -rw-r--r-- | library/std/src/sys/pal/windows/compat.rs | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/library/std/src/sys/pal/windows/c.rs b/library/std/src/sys/pal/windows/c.rs index b65ad7dbe8c..9ce3e912caf 100644 --- a/library/std/src/sys/pal/windows/c.rs +++ b/library/std/src/sys/pal/windows/c.rs @@ -175,9 +175,9 @@ extern "system" { pub fn WakeByAddressAll(address: *const c_void); } +// These are loaded by `load_synch_functions`. #[cfg(target_vendor = "win7")] compat_fn_optional! { - crate::sys::compat::load_synch_functions(); pub fn WaitOnAddress( address: *const c_void, compareaddress: *const c_void, diff --git a/library/std/src/sys/pal/windows/compat.rs b/library/std/src/sys/pal/windows/compat.rs index c8e25dd0c94..42999da1664 100644 --- a/library/std/src/sys/pal/windows/compat.rs +++ b/library/std/src/sys/pal/windows/compat.rs @@ -198,11 +198,10 @@ macro_rules! compat_fn_with_fallback { /// Optionally loaded functions. /// -/// Actual loading of the function defers to $load_functions. +/// Relies on the functions being pre-loaded elsewhere. #[cfg(target_vendor = "win7")] macro_rules! compat_fn_optional { - ($load_functions:expr; - $( + ($( $(#[$meta:meta])* $vis:vis fn $symbol:ident($($argname:ident: $argtype:ty),*) $(-> $rettype:ty)?; )+) => ( @@ -221,9 +220,6 @@ macro_rules! compat_fn_optional { #[inline(always)] pub fn option() -> Option<F> { - // Miri does not understand the way we do preloading - // therefore load the function here instead. - #[cfg(miri)] $load_functions; NonNull::new(PTR.load(Ordering::Relaxed)).map(|f| unsafe { mem::transmute(f) }) } } |