diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/isolate.rs | 8 | ||||
| -rw-r--r-- | src/libdeno.rs | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/isolate.rs b/src/isolate.rs index 8f8e798fb..dc44b11e2 100644 --- a/src/isolate.rs +++ b/src/isolate.rs @@ -100,8 +100,8 @@ impl Isolate { self as *mut _ as *mut c_void } - pub fn from_c<'a>(d: *const libdeno::isolate) -> &'a mut Isolate { - let ptr = unsafe { libdeno::deno_get_data(d) } as *mut _; + pub fn from_void_ptr<'a>(ptr: *mut c_void) -> &'a mut Isolate { + let ptr = ptr as *mut _; unsafe { &mut *ptr } } @@ -236,7 +236,7 @@ impl From<Buf> for libdeno::deno_buf { // Dereferences the C pointer into the Rust Isolate object. extern "C" fn pre_dispatch( - d: *const libdeno::isolate, + user_data: *mut c_void, req_id: i32, control_buf: libdeno::deno_buf, data_buf: libdeno::deno_buf, @@ -256,7 +256,7 @@ extern "C" fn pre_dispatch( ) }; - let isolate = Isolate::from_c(d); + let isolate = Isolate::from_void_ptr(user_data); let dispatch = isolate.dispatch; let (is_sync, op) = dispatch(isolate, control_slice, data_slice); diff --git a/src/libdeno.rs b/src/libdeno.rs index 77f7f5c3e..4417ac544 100644 --- a/src/libdeno.rs +++ b/src/libdeno.rs @@ -20,7 +20,7 @@ pub struct deno_buf { } type DenoRecvCb = unsafe extern "C" fn( - d: *const isolate, + user_data: *mut c_void, req_id: i32, buf: deno_buf, data_buf: deno_buf, @@ -33,7 +33,6 @@ extern "C" { pub fn deno_new(cb: DenoRecvCb) -> *const isolate; pub fn deno_delete(i: *const isolate); pub fn deno_last_exception(i: *const isolate) -> *const c_char; - pub fn deno_get_data(i: *const isolate) -> *mut c_void; pub fn deno_respond( i: *const isolate, user_data: *mut c_void, |