diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2014-12-29 17:25:59 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2014-12-29 17:30:20 -0400 |
| commit | e79780c0cac64c7b74754e47fc066aa0fc104345 (patch) | |
| tree | 1baa2628f02698a883f8d0bfc8d362307cfa1d11 /Annex | |
| parent | daa420a9f299c331b24488d133d068ddc451b9aa (diff) | |
fixed all remaining build warnings on Windows
Diffstat (limited to 'Annex')
| -rw-r--r-- | Annex/Init.hs | 6 | ||||
| -rw-r--r-- | Annex/Ssh.hs | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Annex/Init.hs b/Annex/Init.hs index dae7ccc1c..b335d10d3 100644 --- a/Annex/Init.hs +++ b/Annex/Init.hs @@ -32,14 +32,14 @@ import Config import Annex.Direct import Annex.Content.Direct import Annex.Environment -import Annex.Perms import Backend +import Annex.Hook +import Upgrade #ifndef mingw32_HOST_OS import Utility.UserInfo import Utility.FileMode +import Annex.Perms #endif -import Annex.Hook -import Upgrade genDescription :: Maybe String -> Annex String genDescription (Just d) = return d diff --git a/Annex/Ssh.hs b/Annex/Ssh.hs index 3b7bd7d69..15b169862 100644 --- a/Annex/Ssh.hs +++ b/Annex/Ssh.hs @@ -35,9 +35,9 @@ import Config.Files import Utility.Env import Types.CleanupActions import Annex.Index (addGitEnv) -import Utility.LockFile #ifndef mingw32_HOST_OS import Annex.Perms +import Utility.LockFile #endif {- Generates parameters to ssh to a given host (or user@host) on a given |