diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2018-06-20 13:07:37 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2018-06-20 13:07:37 +0200 |
| commit | 33f015b5c94c9900db5f9e7f7296f57e759094c5 (patch) | |
| tree | b7ee38b968d0a6b241c8d3cc011a907a4b3dfc62 | |
| parent | 8057c924ce9ff395c4966510c1dee128569e5aa1 (diff) | |
| parent | 6a9efa630a73a6943b24b2f85d211e518c783694 (diff) | |
| download | mullvadvpn-33f015b5c94c9900db5f9e7f7296f57e759094c5.tar.xz mullvadvpn-33f015b5c94c9900db5f9e7f7296f57e759094c5.zip | |
Merge branch 'move-libc-import'
| -rw-r--r-- | Cargo.lock | 1 | ||||
| -rw-r--r-- | talpid-core/Cargo.toml | 2 | ||||
| -rw-r--r-- | talpid-core/src/firewall/windows/mod.rs | 3 | ||||
| -rw-r--r-- | talpid-core/src/lib.rs | 1 | ||||
| -rw-r--r-- | talpid-core/src/process/openvpn.rs | 1 | ||||
| -rw-r--r-- | talpid-core/src/process/stoppable_process.rs | 2 |
6 files changed, 3 insertions, 7 deletions
diff --git a/Cargo.lock b/Cargo.lock index 94f2e6b375..94737eb8cc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -781,6 +781,7 @@ dependencies = [ "tokio-core 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-timer 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "uuid 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "windows-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/talpid-core/Cargo.toml b/talpid-core/Cargo.toml index 1a906ae6f3..e87ea35eb5 100644 --- a/talpid-core/Cargo.toml +++ b/talpid-core/Cargo.toml @@ -11,7 +11,6 @@ duct = "0.10" error-chain = "0.11" jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc", tag = "v8.0.1" } jsonrpc-macros = { git = "https://github.com/paritytech/jsonrpc", tag = "v8.0.1" } -libc = "0.2.20" log = "0.4" os_pipe = "0.6" uuid = { version = "0.6", features = ["v4"] } @@ -32,6 +31,7 @@ core-foundation = "0.5" tokio-core = "0.1" [target.'cfg(windows)'.dependencies] +libc = "0.2.20" widestring = "0.3" [dev-dependencies] diff --git a/talpid-core/src/firewall/windows/mod.rs b/talpid-core/src/firewall/windows/mod.rs index 1ae9bf6f1e..f85dc090ca 100644 --- a/talpid-core/src/firewall/windows/mod.rs +++ b/talpid-core/src/firewall/windows/mod.rs @@ -1,4 +1,3 @@ -extern crate libc; extern crate widestring; use super::{Firewall, SecurityPolicy}; @@ -137,7 +136,7 @@ impl WindowsFirewall { #[allow(non_snake_case)] mod ffi { - use super::libc; + extern crate libc; use super::{ErrorKind, Result}; use std::ffi::CStr; use std::os::raw::c_char; diff --git a/talpid-core/src/lib.rs b/talpid-core/src/lib.rs index c2939cc762..a005cd6b8d 100644 --- a/talpid-core/src/lib.rs +++ b/talpid-core/src/lib.rs @@ -12,7 +12,6 @@ extern crate atty; extern crate duct; - #[macro_use] extern crate log; diff --git a/talpid-core/src/process/openvpn.rs b/talpid-core/src/process/openvpn.rs index b7621deaf5..527e45f3f3 100644 --- a/talpid-core/src/process/openvpn.rs +++ b/talpid-core/src/process/openvpn.rs @@ -1,5 +1,4 @@ use duct; -extern crate libc; extern crate os_pipe; use super::stoppable_process::StoppableProcess; diff --git a/talpid-core/src/process/stoppable_process.rs b/talpid-core/src/process/stoppable_process.rs index bfd0ec3ac4..84963ef0cd 100644 --- a/talpid-core/src/process/stoppable_process.rs +++ b/talpid-core/src/process/stoppable_process.rs @@ -1,5 +1,3 @@ -extern crate libc; - use std::io; use std::thread; use std::time::{Duration, Instant}; |