File tree Expand file tree Collapse file tree 2 files changed +3
-7
lines changed Expand file tree Collapse file tree 2 files changed +3
-7
lines changed Original file line number Diff line number Diff line change @@ -175,9 +175,9 @@ extern "system" {
175175    pub  fn  WakeByAddressAll ( address :  * const  c_void ) ; 
176176} 
177177
178+ // These are loaded by `load_synch_functions`. 
178179#[ cfg( target_vendor = "win7" ) ]  
179180compat_fn_optional !  { 
180-     crate :: sys:: compat:: load_synch_functions( ) ; 
181181    pub  fn  WaitOnAddress ( 
182182        address:  * const  c_void, 
183183        compareaddress:  * const  c_void, 
Original file line number Diff line number Diff line change @@ -198,11 +198,10 @@ macro_rules! compat_fn_with_fallback {
198198
199199/// Optionally loaded functions. 
200200/// 
201- /// Actual loading of  the function defers to $load_functions . 
201+ /// Relies on  the functions being pre-loaded elsewhere . 
202202#[ cfg( target_vendor = "win7" ) ]  
203203macro_rules!  compat_fn_optional { 
204-     ( $load_functions: expr; 
205-     $( 
204+     ( $( 
206205        $( #[ $meta: meta] ) * 
207206        $vis: vis fn  $symbol: ident( $( $argname: ident:  $argtype: ty) ,* )  $( -> $rettype: ty) ?; 
208207    ) +)  => ( 
@@ -221,9 +220,6 @@ macro_rules! compat_fn_optional {
221220
222221                #[ inline( always) ] 
223222                pub  fn  option( )  -> Option <F > { 
224-                     // Miri does not understand the way we do preloading 
225-                     // therefore load the function here instead. 
226-                     #[ cfg( miri) ]  $load_functions; 
227223                    NonNull :: new( PTR . load( Ordering :: Relaxed ) ) . map( |f| unsafe  {  mem:: transmute( f)  } ) 
228224                } 
229225            } 
 
 
   
 
     
   
   
          
    
    
     
    
      
     
     
    You can’t perform that action at this time.
  
 
    
  
    
      
        
     
       
      
     
   
 
    
    
  
 
  
 
     
    
0 commit comments