diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-02-25 14:09:39 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-02-25 14:48:50 -0400 |
| commit | f55d91cc91eec2debf4bb013ff2f5201ea1474ea (patch) | |
| tree | 8b8701608fef4f49622018f26706ebd46bfae943 /Utility | |
| parent | c3aaa702c8fe4424dacfddfc255fca8d6149ad06 (diff) | |
fix all remaining -Wall warnings on Windows
Diffstat (limited to 'Utility')
| -rw-r--r-- | Utility/LogFile.hs | 2 | ||||
| -rw-r--r-- | Utility/Path.hs | 1 | ||||
| -rw-r--r-- | Utility/WebApp.hs | 5 | ||||
| -rw-r--r-- | Utility/WinProcess.hs | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/Utility/LogFile.hs b/Utility/LogFile.hs index 4e76116ba..73fbf820e 100644 --- a/Utility/LogFile.hs +++ b/Utility/LogFile.hs @@ -11,7 +11,9 @@ module Utility.LogFile where import Common +#ifndef mingw32_HOST_OS import System.Posix.Types +#endif #ifndef mingw32_HOST_OS openLog :: FilePath -> IO Fd diff --git a/Utility/Path.hs b/Utility/Path.hs index e22d0c3f7..570350d61 100644 --- a/Utility/Path.hs +++ b/Utility/Path.hs @@ -18,7 +18,6 @@ import Data.Char import Control.Applicative #ifdef mingw32_HOST_OS -import Data.Char import qualified System.FilePath.Posix as Posix #else import System.Posix.Files diff --git a/Utility/WebApp.hs b/Utility/WebApp.hs index f92c21e4e..6318abdcf 100644 --- a/Utility/WebApp.hs +++ b/Utility/WebApp.hs @@ -23,7 +23,6 @@ import Network.HTTP.Types import System.Log.Logger import qualified Data.CaseInsensitive as CI import Network.Socket -import Control.Exception import "crypto-api" Crypto.Random import qualified Web.ClientSession as CS import qualified Data.ByteString.Lazy as L @@ -39,6 +38,10 @@ import Control.Concurrent #ifdef __ANDROID__ import Data.Endian #endif +#if defined(__ANDROID__) || defined (mingw32_HOST_OS) +#else +import Control.Exception (bracketOnError) +#endif localhost :: HostName localhost = "localhost" diff --git a/Utility/WinProcess.hs b/Utility/WinProcess.hs index 5c6d4cfce..7a566dcba 100644 --- a/Utility/WinProcess.hs +++ b/Utility/WinProcess.hs @@ -11,9 +11,5 @@ module Utility.WinProcess where import Utility.PID -import System.Win32.Process -import Foreign.C -import Control.Exception - foreign import ccall unsafe "terminatepid" terminatePID :: PID -> IO () |