summaryrefslogtreecommitdiffhomepage
path: root/talpid-core/src
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2023-08-02 15:27:06 +0200
committerLinus Färnstrand <linus@mullvad.net>2023-08-08 10:40:48 +0200
commit9766f2bef6cfcba6c45887da34dcfa422bc0a259 (patch)
tree0f589ca09aa969a80b69d315834cee83137ee3e9 /talpid-core/src
parent92c2dd83db7c4bc3da1f1093c730b0cbb97ca484 (diff)
downloadmullvadvpn-9766f2bef6cfcba6c45887da34dcfa422bc0a259.tar.xz
mullvadvpn-9766f2bef6cfcba6c45887da34dcfa422bc0a259.zip
Migrate from libc::c_void to std::ffi::c_void
Diffstat (limited to 'talpid-core/src')
-rw-r--r--talpid-core/src/firewall/windows.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/talpid-core/src/firewall/windows.rs b/talpid-core/src/firewall/windows.rs
index b7b4ac39f6..807308722d 100644
--- a/talpid-core/src/firewall/windows.rs
+++ b/talpid-core/src/firewall/windows.rs
@@ -335,7 +335,7 @@ fn widestring_ip(ip: IpAddr) -> WideCString {
pub extern "system" fn log_sink(
level: log::Level,
msg: *const libc::c_char,
- context: *mut libc::c_void,
+ context: *mut std::ffi::c_void,
) {
if msg.is_null() {
log::error!("Log message from FFI boundary is NULL");
@@ -409,11 +409,11 @@ fn multibyte_to_wide(mb_string: &CStr, codepage: u32) -> Result<Vec<u16>, io::Er
#[allow(non_snake_case)]
mod winfw {
use super::{widestring_ip, AllowedEndpoint, AllowedTunnelTraffic, Error, WideCString};
- use libc;
+ use std::ffi::c_void;
use talpid_types::net::TransportProtocol;
type LogSink =
- extern "system" fn(level: log::Level, msg: *const libc::c_char, context: *mut libc::c_void);
+ extern "system" fn(level: log::Level, msg: *const libc::c_char, context: *mut c_void);
pub struct WinFwAllowedEndpointContainer {
_clients: Box<[WideCString]>,