T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use winapi::ctypes::c_void on Windows. (#297)

Browse Source 
`winapi::ctypes::c_void` is apparently distinct from `core::ffi::c_void`
and `libc::c_void`.
This commit is contained in:
Dan Gohman
2019-08-24 07:04:31 -07:00
committed by GitHub
parent 479592f8c5
commit 45fd9dadd8
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wasmtime-runtime/src/mmap.rs
View File

@@ -187,7 +187,7 @@ impl Mmap {
/// `self`'s reserved memory. /// `self`'s reserved memory.
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
pub fn make_accessible(&mut self, start: usize, len: usize) -> Result<(), String> { pub fn make_accessible(&mut self, start: usize, len: usize) -> Result<(), String> {
use core::ffi::c_void; use winapi::ctypes::c_void;
use winapi::um::memoryapi::VirtualAlloc; use winapi::um::memoryapi::VirtualAlloc;
use winapi::um::winnt::{MEM_COMMIT, PAGE_READWRITE}; use winapi::um::winnt::{MEM_COMMIT, PAGE_READWRITE};
let page_size = region::page::size(); let page_size = region::page::size();
@@ -251,9 +251,10 @@ impl Drop for Mmap {
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
fn drop(&mut self) { fn drop(&mut self) {
if self.len != 0 { if self.len != 0 {
use winapi::ctypes::c_void;
use winapi::um::memoryapi::VirtualFree; use winapi::um::memoryapi::VirtualFree;
use winapi::um::winnt::MEM_RELEASE; use winapi::um::winnt::MEM_RELEASE;
let r = unsafe { VirtualFree(self.ptr as *mut libc::c_void, self.len, MEM_RELEASE) }; let r = unsafe { VirtualFree(self.ptr as *mut c_void, self.len, MEM_RELEASE) };
assert_eq!(r, 0); assert_eq!(r, 0);
} }
} }