fix build warnings on windows

diff --git a/Annex/Action.hs b/Annex/Action.hs
index 5c3bf6ca803a8b86c59040aefaf37944cb420f79..641a184e62173c8790a51607d395ddc9b4fbbf6d 100644 (file)
--- a/Annex/Action.hs
+++ b/Annex/Action.hs
@@ -27,8 +27,8 @@ import Annex.CheckIgnore
 import Annex.TransferrerPool
 import qualified Database.Keys
 
-import Control.Concurrent.STM
 #ifndef mingw32_HOST_OS
+import Control.Concurrent.STM
 import System.Posix.Signals
 #endif
 

diff --git a/Annex/Init.hs b/Annex/Init.hs
index 1220c2e58ea199c050777928b2c347113a23d626..860206c60405d2c9f11c0bc6d026347076c9ace8 100644 (file)
--- a/Annex/Init.hs
+++ b/Annex/Init.hs
@@ -51,10 +51,10 @@ import Annex.InodeSentinal
 import Upgrade
 import Annex.Tmp
 import Utility.UserInfo
-import qualified Utility.RawFilePath as R
-import Utility.ThreadScheduler
 import Annex.Perms
 #ifndef mingw32_HOST_OS
+import Utility.ThreadScheduler
+import qualified Utility.RawFilePath as R
 import Utility.FileMode
 import System.Posix.User
 import qualified Utility.LockFile.Posix as Posix
@@ -62,8 +62,8 @@ import qualified Utility.LockFile.Posix as Posix
 
 import qualified Data.Map as M
 import Control.Monad.IO.Class (MonadIO)
-import System.PosixCompat.Files (ownerReadMode, isNamedPipe)
 #ifndef mingw32_HOST_OS
+import System.PosixCompat.Files (ownerReadMode, isNamedPipe)
 import Data.Either
 import qualified System.FilePath.ByteString as P
 import Control.Concurrent.Async

diff --git a/Annex/Link.hs b/Annex/Link.hs
index 9c75a8b72803ababfeeabb8c6258d427be2ee7af..4ef0a12689eea62276b139f3f8424aa0131c020b 100644 (file)
--- a/Annex/Link.hs
+++ b/Annex/Link.hs
@@ -43,7 +43,9 @@ import qualified Data.ByteString as S
 import qualified Data.ByteString.Char8 as S8
 import qualified Data.ByteString.Lazy as L
 import qualified System.FilePath.ByteString as P
+#ifndef mingw32_HOST_OS
 import System.PosixCompat.Files (isSymbolicLink)
+#endif
 
 type LinkTarget = S.ByteString
 

diff --git a/Command/Fsck.hs b/Command/Fsck.hs
index dd48c986805b88101a5729cd7889778aa772c1c0..8485f33ebb1ad9c4b6310fb4db5d37eb108d0c02 100644 (file)
--- a/Command/Fsck.hs
+++ b/Command/Fsck.hs
@@ -16,11 +16,13 @@ import qualified Remote
 import qualified Types.Backend
 import qualified Backend
 import Annex.Content
+#ifndef mingw32_HOST_OS
+import Annex.Version
 import Annex.Content.Presence
+#endif
 import Annex.Content.Presence.LowLevel
 import Annex.Perms
 import Annex.Link
-import Annex.Version
 import Logs.Location
 import Logs.Trust
 import Logs.Activity

diff --git a/Command/RemoteDaemon.hs b/Command/RemoteDaemon.hs
index 72502d9a6a3a3a66ca4799096b8b62507126af87..728b16da6d938ce03732288da71a8ccc4fdacef0 100644 (file)
--- a/Command/RemoteDaemon.hs
+++ b/Command/RemoteDaemon.hs
@@ -12,7 +12,9 @@ module Command.RemoteDaemon where
 import Command
 import RemoteDaemon.Core
 import Utility.Daemon
+#ifndef mingw32_HOST_OS
 import Annex.Path
+#endif
 
 cmd :: Command
 cmd = noCommit $

diff --git a/Git/Hook.hs b/Git/Hook.hs
index 39d653e02064bc48313aae0012c1c28055c5b327..ba9031d8000ca8c6b556976a8d1deda79b093474 100644 (file)
--- a/Git/Hook.hs
+++ b/Git/Hook.hs
@@ -14,9 +14,11 @@ import Git
 import Utility.Tmp
 import Utility.Shell
 import Utility.FileMode
+#ifndef mingw32_HOST_OS
 import qualified Utility.RawFilePath as R
-
 import System.PosixCompat.Files (fileMode)
+#endif
+
 
 data Hook = Hook
        { hookName :: FilePath

diff --git a/Remote/Directory.hs b/Remote/Directory.hs
index 5721bd20fab97e8a3b890be2ac02aee6db8cf17e..4d91b2551e0c9dac48ac6e588620305fcdd938df 100644 (file)
--- a/Remote/Directory.hs
+++ b/Remote/Directory.hs
@@ -19,7 +19,10 @@ import qualified Data.ByteString.Lazy as L
 import qualified Data.Map as M
 import qualified System.FilePath.ByteString as P
 import Data.Default
-import System.PosixCompat.Files (isRegularFile, getFdStatus, deviceID)
+import System.PosixCompat.Files (isRegularFile, deviceID)
+#ifndef mingw32_HOST_OS
+import System.PosixCompat.Files (getFdStatus)
+#endif
 
 import Annex.Common
 import Types.Remote

diff --git a/Utility/DirWatcher/Win32Notify.hs b/Utility/DirWatcher/Win32Notify.hs
index eaff7f95ff88d6e35622820f95b71cb51375ff32..f91f68247dedf505835f3d5569bc98cda70adf70 100644 (file)
--- a/Utility/DirWatcher/Win32Notify.hs
+++ b/Utility/DirWatcher/Win32Notify.hs
@@ -7,7 +7,7 @@
 
 module Utility.DirWatcher.Win32Notify (watchDir) where
 
-import Common hiding (isDirectory)
+import Common
 import Utility.DirWatcher.Types
 import qualified Utility.RawFilePath as R
 

diff --git a/Utility/FileMode.hs b/Utility/FileMode.hs
index fd3d9a104aa6ca7aa5b993e28e76c8a0a33b9c5e..5b56ff7c30f096dc23cc1647cfb6313f7d22ea5a 100644 (file)
--- a/Utility/FileMode.hs
+++ b/Utility/FileMode.hs
@@ -17,6 +17,9 @@ import System.IO
 import Control.Monad
 import System.PosixCompat.Types
 import System.PosixCompat.Files (unionFileModes, intersectFileModes, stdFileMode, nullFileMode, setFileCreationMask, groupReadMode, ownerReadMode, ownerWriteMode, ownerExecuteMode, groupWriteMode, groupExecuteMode, otherReadMode, otherWriteMode, otherExecuteMode, fileMode)
+#ifndef mingw32_HOST_OS
+import System.PosixCompat.Files (setFileCreationMask)
+#endif
 import Control.Monad.IO.Class
 import Foreign (complement)
 import Control.Monad.Catch

diff --git a/Utility/FileSize.hs b/Utility/FileSize.hs
index 2268c3bdd832b58f35118a60dad32f67fe5bdedf..3d216f2be487a23ac15053780cedeea74d3774df 100644 (file)
--- a/Utility/FileSize.hs
+++ b/Utility/FileSize.hs
@@ -14,13 +14,15 @@ module Utility.FileSize (
        getFileSize',
 ) where
 
-import System.PosixCompat.Files (FileStatus, fileSize)
-import qualified Utility.RawFilePath as R
 #ifdef mingw32_HOST_OS
 import Control.Exception (bracket)
 import System.IO
 import Utility.FileSystemEncoding
+#else
+import System.PosixCompat.Files (fileSize)
 #endif
+import System.PosixCompat.Files (FileStatus)
+import qualified Utility.RawFilePath as R
 
 type FileSize = Integer
 

diff --git a/Utility/InodeCache.hs b/Utility/InodeCache.hs
index 6f07059f53cd79dd581e9ebf296676bb48894a84..3828bc645a4af2fb24c6ce7598a46f3cc994b916 100644 (file)
--- a/Utility/InodeCache.hs
+++ b/Utility/InodeCache.hs
@@ -54,9 +54,7 @@ import System.PosixCompat.Types
 import System.PosixCompat.Files (isRegularFile, fileID)
 import Data.Time.Clock.POSIX
 
-#ifdef mingw32_HOST_OS
-import Data.Word (Word64)
-#else
+#ifndef mingw32_HOST_OS
 import qualified System.Posix.Files as Posix
 #endif
 

diff --git a/Utility/LockFile/Windows.hs b/Utility/LockFile/Windows.hs
index 3b8e0dc02e59b4c838f39e02be2e141ad30d4b8c..2ab521e438c525afe50a5f698732149cc2a7a6f6 100644 (file)
--- a/Utility/LockFile/Windows.hs
+++ b/Utility/LockFile/Windows.hs
@@ -21,7 +21,6 @@ import Control.Concurrent
 
 import Utility.Path.Windows
 import Utility.FileSystemEncoding
-import Utility.Split
 
 type LockFile = RawFilePath
 

diff --git a/Utility/MoveFile.hs b/Utility/MoveFile.hs
index bba12fdb319634e6377a61536f459e7a179f6ef6..6481b29ed38dfcb28873c2758fe2b15b085ae894 100644 (file)
--- a/Utility/MoveFile.hs
+++ b/Utility/MoveFile.hs
@@ -14,11 +14,11 @@ module Utility.MoveFile (
 ) where
 
 import Control.Monad
-import System.PosixCompat.Files (isDirectory)
 import System.IO.Error
 import Prelude
 
 #ifndef mingw32_HOST_OS
+import System.PosixCompat.Files (isDirectory)
 import Control.Monad.IfElse
 import Utility.SafeCommand
 #endif