Skip to content

Commit

Permalink
sys/windows: remove miri hack that is only needed for win7
Browse files Browse the repository at this point in the history
  • Loading branch information
RalfJung committed Oct 13, 2024
1 parent b6c0376 commit e2c210e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
2 changes: 1 addition & 1 deletion std/src/sys/pal/windows/c.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
8 changes: 2 additions & 6 deletions std/src/sys/pal/windows/compat.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)?;
)+) => (
Expand All @@ -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) })
}
}
Expand Down

0 comments on commit e2c210e

Please sign in to comment.