mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

squash remaining build warnings on windows

Browse source
This commit is contained in:
Joey Hess 2020-11-24 12:35:09 -04:00
parent e59cec1755
commit dce0781391
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Annex/Init.hs
View file

@ -49,19 +49,21 @@ import Annex.InodeSentinal
import Upgrade import Upgrade
import Annex.Tmp import Annex.Tmp
import Utility.UserInfo import Utility.UserInfo
import Utility.ThreadScheduler
import qualified Utility.RawFilePath as R
#ifndef mingw32_HOST_OS #ifndef mingw32_HOST_OS
import qualified Utility.RawFilePath as R
import Utility.ThreadScheduler
import Annex.Perms import Annex.Perms
import Utility.FileMode import Utility.FileMode
import System.Posix.User import System.Posix.User
import qualified Utility.LockFile.Posix as Posix import qualified Utility.LockFile.Posix as Posix
import Data.Either
#endif #endif
import qualified Data.Map as M import qualified Data.Map as M
#ifndef mingw32_HOST_OS
import Data.Either
import qualified System.FilePath.ByteString as P import qualified System.FilePath.ByteString as P
import Control.Concurrent.Async import Control.Concurrent.Async
#endif
checkCanInitialize :: Annex a -> Annex a checkCanInitialize :: Annex a -> Annex a
checkCanInitialize a = canInitialize' >>= \case checkCanInitialize a = canInitialize' >>= \case

7
Utility/FileSystemEncoding.hs
View file

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

4
Utility/WebApp.hs
View file

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