From 804808d569d2f2d09ade0c71240b5d27b5d7bf52 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Mon, 23 Nov 2020 14:00:17 -0400
Subject: [PATCH] squash build warnings on windows

---
 Annex/PidLock.hs              | 4 ++--
 Git/Queue.hs                  | 2 ++
 Utility/Batch.hs              | 4 +---
 Utility/FileSystemEncoding.hs | 2 ++
 Utility/Gpg.hs                | 2 +-
 Utility/LockFile/Windows.hs   | 1 -
 Utility/MoveFile.hs           | 2 +-
 Utility/Process/Transcript.hs | 2 +-
 Utility/RawFilePath.hs        | 1 -
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Annex/PidLock.hs b/Annex/PidLock.hs
index 6d3f0a7925..43c43cc92b 100644
--- a/Annex/PidLock.hs
+++ b/Annex/PidLock.hs
@@ -10,10 +10,10 @@
 module Annex.PidLock where
 
 import Annex.Common
-import Annex.GitOverlay
 import Git
-import Git.Env
 #ifndef mingw32_HOST_OS
+import Git.Env
+import Annex.GitOverlay
 import qualified Utility.LockFile.PidLock as PidF
 import qualified Utility.LockPool.PidLock as PidP
 import Utility.LockPool (dropLock)
diff --git a/Git/Queue.hs b/Git/Queue.hs
index edf9d84cbd..90b7e2279f 100644
--- a/Git/Queue.hs
+++ b/Git/Queue.hs
@@ -207,11 +207,13 @@ runAction repo action@(CommandAction {}) = liftIO $ do
   where
 	gitparams = gitCommandLine
 		(Param (getSubcommand action):getParams action) repo
+#ifndef mingw32_HOST_OS
 	go p (Just h) _ _ pid = do
 		hPutStr h $ intercalate "\0" $ toCommand $ getFiles action
 		hClose h
 		forceSuccessProcess p pid
 	go _ _ _ _ _ = error "internal"
+#endif
 runAction repo action@(InternalAction {}) =
 	let InternalActionRunner _ runner = getRunner action
 	in runner repo (getInternalFiles action)
diff --git a/Utility/Batch.hs b/Utility/Batch.hs
index 7a89448810..de66913ee1 100644
--- a/Utility/Batch.hs
+++ b/Utility/Batch.hs
@@ -41,13 +41,11 @@ batch a = wait =<< batchthread
 	batchthread = asyncBound $ do
 		setProcessPriority 0 maxNice
 		a
+	maxNice = 19
 #else
 batch a = a
 #endif
 
-maxNice :: Int
-maxNice = 19
-
 {- Makes a command be run by whichever of nice, ionice, and nocache
  - are available in the path. -}
 type BatchCommandMaker = (String, [CommandParam]) -> (String, [CommandParam])
diff --git a/Utility/FileSystemEncoding.hs b/Utility/FileSystemEncoding.hs
index 4c099ff3a4..2a23c01f86 100644
--- a/Utility/FileSystemEncoding.hs
+++ b/Utility/FileSystemEncoding.hs
@@ -178,6 +178,7 @@ fromRawFilePath = decodeFilePath
 toRawFilePath :: FilePath -> RawFilePath
 toRawFilePath = encodeFilePath
 
+#ifndef mingw32_HOST_OS
 {- Converts a [Word8] to a FilePath, encoding using the filesystem encoding.
  -
  - w82s produces a String, which may contain Chars that are invalid
@@ -206,6 +207,7 @@ decodeW8NUL :: FilePath -> [Word8]
 decodeW8NUL = intercalate [c2w8 nul] . map decodeW8 . splitc nul
   where
 	nul = '\NUL'
+#endif
 
 c2w8 :: Char -> Word8
 c2w8 = fromIntegral . fromEnum
diff --git a/Utility/Gpg.hs b/Utility/Gpg.hs
index b705bb599a..b8432b7b92 100644
--- a/Utility/Gpg.hs
+++ b/Utility/Gpg.hs
@@ -332,6 +332,7 @@ genRandom cmd highQuality size = checksize <$> readStrict cmd params
 testKeyId :: String
 testKeyId = "129D6E0AC537B9C7"
 
+#ifndef mingw32_HOST_OS
 testKey :: String
 testKey = keyBlock True
 	[ "mI0ETvFAZgEEAKnqwWgZqznMhi1RQExem2H8t3OyKDxaNN3rBN8T6LWGGqAYV4wT"
@@ -400,7 +401,6 @@ keyBlock public ls = unlines
 		| public = "PUBLIC"
 		| otherwise = "PRIVATE"
 
-#ifndef mingw32_HOST_OS
 {- Runs an action using gpg in a test harness, in which gpg does
  - not use ~/.gpg/, but sets up the test key in a subdirectory of 
  - the passed directory and uses it.
diff --git a/Utility/LockFile/Windows.hs b/Utility/LockFile/Windows.hs
index 781f8cfd31..100fa854f7 100644
--- a/Utility/LockFile/Windows.hs
+++ b/Utility/LockFile/Windows.hs
@@ -16,7 +16,6 @@ module Utility.LockFile.Windows (
 import System.Win32.Types
 import System.Win32.File
 import Control.Concurrent
-import System.FilePath.ByteString (RawFilePath)
 
 import Utility.FileSystemEncoding
 
diff --git a/Utility/MoveFile.hs b/Utility/MoveFile.hs
index 695ed03f57..2bc3a8d287 100644
--- a/Utility/MoveFile.hs
+++ b/Utility/MoveFile.hs
@@ -16,11 +16,11 @@ module Utility.MoveFile (
 import Control.Monad
 import System.FilePath
 import System.PosixCompat.Files
-import Control.Monad.IfElse
 import System.IO.Error
 import Prelude
 
 #ifndef mingw32_HOST_OS
+import Control.Monad.IfElse
 import Utility.SafeCommand
 #endif
 
diff --git a/Utility/Process/Transcript.hs b/Utility/Process/Transcript.hs
index 296cdab9a7..e720a289e7 100644
--- a/Utility/Process/Transcript.hs
+++ b/Utility/Process/Transcript.hs
@@ -20,8 +20,8 @@ import System.IO
 import System.Exit
 import Control.Concurrent.Async
 import Control.Monad
-import Control.Exception
 #ifndef mingw32_HOST_OS
+import Control.Exception
 import qualified System.Posix.IO
 #else
 import Control.Applicative
diff --git a/Utility/RawFilePath.hs b/Utility/RawFilePath.hs
index c114fd9d3d..f32b2260f8 100644
--- a/Utility/RawFilePath.hs
+++ b/Utility/RawFilePath.hs
@@ -46,7 +46,6 @@ createDirectory :: RawFilePath -> IO ()
 createDirectory p = D.createDirectory p 0o777
 
 #else
-import qualified Data.ByteString as B
 import System.PosixCompat (FileStatus, FileMode)
 import qualified System.PosixCompat as P
 import qualified System.PosixCompat.Files as F