summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorEmīls Piņķis <emils@mullvad.net>2019-01-17 13:58:13 +0000
committerEmīls Piņķis <emils@mullvad.net>2019-01-17 14:07:12 +0000
commit11695f79a006a1354f17edac4c57eb365d8e08d1 (patch)
treed777184e65dea58ce900f392c462b34c8fe769f6
parent92219d2e41d4687fc5ad154cee2932991b5a01d1 (diff)
downloadmullvadvpn-11695f79a006a1354f17edac4c57eb365d8e08d1.tar.xz
mullvadvpn-11695f79a006a1354f17edac4c57eb365d8e08d1.zip
Adjust #[link_name] attributes
-rw-r--r--talpid-core/src/security/windows/dns.rs10
-rw-r--r--talpid-core/src/security/windows/mod.rs12
-rw-r--r--talpid-core/src/winnet.rs4
3 files changed, 13 insertions, 13 deletions
diff --git a/talpid-core/src/security/windows/dns.rs b/talpid-core/src/security/windows/dns.rs
index efe7dd9c73..6c04c03e57 100644
--- a/talpid-core/src/security/windows/dns.rs
+++ b/talpid-core/src/security/windows/dns.rs
@@ -261,7 +261,7 @@ type ErrorSink = extern "system" fn(
#[allow(non_snake_case)]
extern "system" {
- #[link_name(WinDns_Initialize)]
+ #[link_name = "WinDns_Initialize"]
pub fn WinDns_Initialize(
sink: Option<ErrorSink>,
sink_context: *mut c_void,
@@ -270,11 +270,11 @@ extern "system" {
// WinDns_Deinitialize:
//
// Call this function once before unloading WINDNS or exiting the process.
- #[link_name(WinDns_Deinitialize)]
+ #[link_name = "WinDns_Deinitialize"]
pub fn WinDns_Deinitialize() -> DeinitializationResult;
// Configure which DNS servers should be used and start enforcing these settings.
- #[link_name(WinDns_Set)]
+ #[link_name = "WinDns_Set"]
pub fn WinDns_Set(
v4_ips: *mut *const u16,
v4_n_ips: u32,
@@ -288,9 +288,9 @@ extern "system" {
//
// (Also taking into account external changes to DNS settings that have ocurred
// during the period of enforcing specific settings.)
- #[link_name(WinDns_Reset)]
+ #[link_name = "WinDns_Reset"]
pub fn WinDns_Reset() -> ResettingResult;
- #[link_name(WinDns_Recover)]
+ #[link_name = "WinDns_Recover"]
pub fn WinDns_Recover(data: *const u8, length: u32) -> RecoveringResult;
}
diff --git a/talpid-core/src/security/windows/mod.rs b/talpid-core/src/security/windows/mod.rs
index e2930b92fc..e8125c8b80 100644
--- a/talpid-core/src/security/windows/mod.rs
+++ b/talpid-core/src/security/windows/mod.rs
@@ -247,23 +247,23 @@ mod winfw {
ffi_error!(ResettingPolicyResult, ErrorKind::ResettingPolicy.into());
extern "system" {
- #[link_name(WinFw_Initialize)]
+ #[link_name = "WinFw_Initialize"]
pub fn WinFw_Initialize(
timeout: libc::c_uint,
sink: Option<winnet::ErrorSink>,
sink_context: *mut libc::c_void,
) -> InitializationResult;
- #[link_name(WinFw_Deinitialize)]
+ #[link_name = "WinFw_Deinitialize"]
pub fn WinFw_Deinitialize() -> DeinitializationResult;
- #[link_name(WinFw_ApplyPolicyConnecting)]
+ #[link_name = "WinFw_ApplyPolicyConnecting"]
pub fn WinFw_ApplyPolicyConnecting(
settings: &WinFwSettings,
relay: &WinFwRelay,
) -> ApplyConnectingResult;
- #[link_name(WinFw_ApplyPolicyConnected)]
+ #[link_name = "WinFw_ApplyPolicyConnected"]
pub fn WinFw_ApplyPolicyConnected(
settings: &WinFwSettings,
relay: &WinFwRelay,
@@ -271,10 +271,10 @@ mod winfw {
primaryDns: *const libc::wchar_t,
) -> ApplyConnectedResult;
- #[link_name(WinFw_ApplyPolicyBlocked)]
+ #[link_name = "WinFw_ApplyPolicyBlocked"]
pub fn WinFw_ApplyPolicyBlocked(settings: &WinFwSettings) -> ApplyBlockedResult;
- #[link_name(WinFw_Reset)]
+ #[link_name = "WinFw_Reset"]
pub fn WinFw_Reset() -> ResettingPolicyResult;
}
}
diff --git a/talpid-core/src/winnet.rs b/talpid-core/src/winnet.rs
index 7c1215ea3c..0eb80c794b 100644
--- a/talpid-core/src/winnet.rs
+++ b/talpid-core/src/winnet.rs
@@ -58,7 +58,7 @@ pub fn ensure_top_metric_for_interface(interface_alias: &str) -> Result<bool> {
}
extern "system" {
- #[link_name(WinRoute_EnsureTopMetric)]
+ #[link_name = "WinRoute_EnsureTopMetric"]
fn WinRoute_EnsureTopMetric(
tunnel_interface_alias: *const wchar_t,
sink: Option<ErrorSink>,
@@ -87,6 +87,6 @@ pub fn get_tap_interface_ipv6_status() -> Result<bool> {
}
extern "system" {
- #[link_name(GetTapInterfaceIpv6Status)]
+ #[link_name = "GetTapInterfaceIpv6Status"]
fn GetTapInterfaceIpv6Status(sink: Option<ErrorSink>, sink_context: *mut c_void) -> u32;
}