squash remaining build warnings on windows

diff --git a/Annex/Init.hs b/Annex/Init.hs
index 518af110e73d1ca8577512ad2d0af6713acb75dc..4ece574b9ef0c04a6b7a05051be8d8b99e71e4ae 100644 (file)
--- a/Annex/Init.hs
+++ b/Annex/Init.hs
@@ -49,19 +49,21 @@ import Annex.InodeSentinal
 import Upgrade
 import Annex.Tmp
 import Utility.UserInfo
-import Utility.ThreadScheduler
-import qualified Utility.RawFilePath as R
 #ifndef mingw32_HOST_OS
+import qualified Utility.RawFilePath as R
+import Utility.ThreadScheduler
 import Annex.Perms
 import Utility.FileMode
 import System.Posix.User
 import qualified Utility.LockFile.Posix as Posix
-import Data.Either
 #endif
 
 import qualified Data.Map as M
+#ifndef mingw32_HOST_OS
+import Data.Either
 import qualified System.FilePath.ByteString as P
 import Control.Concurrent.Async
+#endif
 
 checkCanInitialize :: Annex a -> Annex a
 checkCanInitialize a = canInitialize' >>= \case

diff --git a/Utility/FileSystemEncoding.hs b/Utility/FileSystemEncoding.hs
index 2a23c01f86eafecabfd98c91a75821925f2268ac..1f7c76be94100e8ecea0dcb4b228cdb911017be3 100644 (file)
--- a/Utility/FileSystemEncoding.hs
+++ b/Utility/FileSystemEncoding.hs
@@ -36,17 +36,18 @@ import Foreign.C
 import System.IO
 import System.IO.Unsafe
 import Data.Word
-import Data.List
+import System.FilePath.ByteString (RawFilePath, encodeFilePath, decodeFilePath)
 import qualified Data.ByteString as S
 import qualified Data.ByteString.Lazy as L
 #ifdef mingw32_HOST_OS
 import qualified Data.ByteString.UTF8 as S8
 import qualified Data.ByteString.Lazy.UTF8 as L8
+#else
+import Data.List
+import Utility.Split
 #endif
-import System.FilePath.ByteString (RawFilePath, encodeFilePath, decodeFilePath)
 
 import Utility.Exception
-import Utility.Split
 
 {- Makes all subsequent Handles that are opened, as well as stdio Handles,
  - use the filesystem encoding, instead of the encoding of the current

diff --git a/Utility/WebApp.hs b/Utility/WebApp.hs
index e6d0da4deecdd398c6efc6a2a365434b9e06e63e..adf32e36d6dbb386d02c17a0466b2bbc9b93cf71 100644 (file)
--- a/Utility/WebApp.hs
+++ b/Utility/WebApp.hs
@@ -36,9 +36,6 @@ import Blaze.ByteString.Builder (Builder)
 import Control.Arrow ((***))
 import Control.Concurrent
 
-localhost :: HostName
-localhost = "localhost"
-
 {- Builds a command to use to start or open a web browser showing an url. -}
 browserProc :: String -> CreateProcess
 #ifdef darwin_HOST_OS
@@ -105,6 +102,7 @@ getSocket h = do
                _ -> error "unable to bind to a local socket"
   where
        hostname = fromMaybe localhost h
+       localhost = "localhost"
        hints = defaultHints { addrSocketType = Stream }
        {- Repeated attempts because bind sometimes fails for an
         - unknown reason on OSX. -}