summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2018-03-05 09:53:12 -0300
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2018-03-06 13:58:02 -0300
commit4d41933445d35797744720601b9dec4fe76c17ad (patch)
tree17242b040b3b5fd72982d2bbd8c351d13d5118ca
parent8d673a4d6768c30b561ae5a6530e9ef59d288537 (diff)
downloadmullvadvpn-4d41933445d35797744720601b9dec4fe76c17ad.tar.xz
mullvadvpn-4d41933445d35797744720601b9dec4fe76c17ad.zip
Place Unix-only dependency in `cfg(unix)`
-rw-r--r--mullvad-daemon/Cargo.toml2
-rw-r--r--mullvad-daemon/src/main.rs1
-rw-r--r--mullvad-daemon/src/rpc_info.rs1
3 files changed, 3 insertions, 1 deletions
diff --git a/mullvad-daemon/Cargo.toml b/mullvad-daemon/Cargo.toml
index 0c4c1a109f..d253d017bc 100644
--- a/mullvad-daemon/Cargo.toml
+++ b/mullvad-daemon/Cargo.toml
@@ -15,7 +15,6 @@ fern = { version = "0.5", features = ["colored"] }
futures = "0.1"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
-libc = "0.2"
log = "0.4"
jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc", tag = "v7.1.1" }
jsonrpc-macros = { git = "https://github.com/paritytech/jsonrpc", tag = "v7.1.1" }
@@ -35,6 +34,7 @@ talpid-ipc = { path = "../talpid-ipc" }
talpid-types = { path = "../talpid-types" }
[target.'cfg(unix)'.dependencies]
+libc = "0.2"
simple-signal = "1.1"
[target.'cfg(windows)'.dependencies]
diff --git a/mullvad-daemon/src/main.rs b/mullvad-daemon/src/main.rs
index 631fe2cdd1..eb6ec9d87f 100644
--- a/mullvad-daemon/src/main.rs
+++ b/mullvad-daemon/src/main.rs
@@ -14,6 +14,7 @@ extern crate clap;
#[macro_use]
extern crate error_chain;
extern crate futures;
+#[cfg(unix)]
extern crate libc;
#[macro_use]
extern crate log;
diff --git a/mullvad-daemon/src/rpc_info.rs b/mullvad-daemon/src/rpc_info.rs
index 33a27828eb..7c906672f5 100644
--- a/mullvad-daemon/src/rpc_info.rs
+++ b/mullvad-daemon/src/rpc_info.rs
@@ -2,6 +2,7 @@ use std::fs::{self, File, OpenOptions};
use std::io::{self, Write};
use std::path::{Path, PathBuf};
+#[cfg(unix)]
use libc;
error_chain! {