From: Joey Hess <joeyh@joeyh.name>
Date: Mon, 15 Feb 2021 17:35:01 +0000 (-0400)
Subject: windows build fix from jwodder
X-Git-Tag: archive/raspbian/10.20250416-2+rpi1~1^2~98^2~13
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=48310f2d558ca2eb1e2bbe5d06d72ef0bb510a47;p=git-annex.git

windows build fix from jwodder
---

diff --git a/Remote/Git.hs b/Remote/Git.hs
index 3ca65c4f65..596c259c56 100644
--- a/Remote/Git.hs
+++ b/Remote/Git.hs
@@ -46,6 +46,7 @@ import Logs.Location
 import Utility.Metered
 import Utility.CopyFile
 import Utility.Env
+import Utility.FileMode
 import Utility.Batch
 import Utility.SimpleProtocol
 import Utility.Touch
@@ -70,7 +71,6 @@ import Messages.Progress
 
 #ifndef mingw32_HOST_OS
 import qualified Utility.RawFilePath as R
-import Utility.FileMode
 #endif
 
 import Control.Concurrent
@@ -654,7 +654,7 @@ copyFromRemoteCheap st repo
 			)
 	| otherwise = Nothing
 #else
-copyFromRemoteCheap _ _ _ = Nothing
+copyFromRemoteCheap _ _ = Nothing
 #endif
 
 {- Tries to copy a key's content to a remote's annex. -}
@@ -927,6 +927,7 @@ newCopyCoWTried = CopyCoWTried <$> newEmptyMVar
 fileCopier :: State -> Copier
 #ifdef mingw32_HOST_OS
 fileCopier _st src dest k meterupdate check verifyconfig = docopy
+  where
 #else
 fileCopier st src dest k meterupdate check verifyconfig =
 	-- If multiple threads reach this at the same time, they
diff --git a/doc/bugs/Windows_build_failing_as_of_commit_cb7bb3e.mdwn b/doc/bugs/Windows_build_failing_as_of_commit_cb7bb3e.mdwn
index 2ae07ac47c..3352bb8654 100644
--- a/doc/bugs/Windows_build_failing_as_of_commit_cb7bb3e.mdwn
+++ b/doc/bugs/Windows_build_failing_as_of_commit_cb7bb3e.mdwn
@@ -2,3 +2,5 @@ As of commit cb7bb3e, trying to build git-annex on Windows fails with a syntax e
 
 [[!meta author=jwodder]]
 [[!tag projects/datalad]]
+
+> applied, thanks [[done]] --[[Joey]]