Attempt #2 for windows building

wasmerio · Apr 9, 2019 · 654fce9 · 654fce9
1 parent 751dff0
commit 654fce9
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/lib/win-exception-handler/src/exception_handling.rs b/lib/win-exception-handler/src/exception_handling.rs
@@ -1,7 +1,8 @@
 use std::ffi::c_void;
+use std::ptr::NonNull;
 use wasmer_runtime_core::vm::{Ctx, Func};
 
-type Trampoline = unsafe extern "C" fn(*mut Ctx, *const Func, *const u64, *mut u64) -> c_void;
+type Trampoline = unsafe extern "C" fn(*mut Ctx, NonNull<Func>, *const u64, *mut u64) -> c_void;
 type CallProtectedResult = Result<(), CallProtectedData>;
 
 #[repr(C)]
@@ -16,7 +17,7 @@ extern "C" {
     pub fn __call_protected(
         trampoline: Trampoline,
         ctx: *mut Ctx,
-        func: *const Func,
+        func: NonNull<Func>,
         param_vec: *const u64,
         return_vec: *mut u64,
         out_result: *mut CallProtectedData,
@@ -26,7 +27,7 @@ extern "C" {
 pub fn _call_protected(
     trampoline: Trampoline,
     ctx: *mut Ctx,
-    func: *const Func,
+    func: NonNull<Func>,
     param_vec: *const u64,
     return_vec: *mut u64,
 ) -> CallProtectedResult {