summaryrefslogtreecommitdiff
path: root/Assistant
diff options
context:
space:
mode:
Diffstat (limited to 'Assistant')
-rw-r--r--Assistant/Pairing.hs2
-rw-r--r--Assistant/Ssh.hs3
2 files changed, 1 insertions, 4 deletions
diff --git a/Assistant/Pairing.hs b/Assistant/Pairing.hs
index 2c1fcf0d0..4736c4396 100644
--- a/Assistant/Pairing.hs
+++ b/Assistant/Pairing.hs
@@ -75,7 +75,7 @@ data PairingInProgress = PairingInProgress
data SomeAddr = IPv4Addr HostAddress
{- My Android build of the Network library does not currently have IPV6
- support. -}
-#ifndef WITH_ANDROID
+#ifndef __ANDROID__
| IPv6Addr HostAddress6
#endif
deriving (Ord, Eq, Read, Show)
diff --git a/Assistant/Ssh.hs b/Assistant/Ssh.hs
index 93d567ce4..4c8d8afbf 100644
--- a/Assistant/Ssh.hs
+++ b/Assistant/Ssh.hs
@@ -15,9 +15,6 @@ import Git.Remote
import Data.Text (Text)
import qualified Data.Text as T
-import qualified Control.Exception as E
-import System.Process (CreateProcess(..))
-import Control.Concurrent
import Data.Char
data SshData = SshData