From: Joey Hess Date: Tue, 26 Mar 2024 17:11:53 +0000 (-0400) Subject: fix build warnings on windows X-Git-Tag: archive/raspbian/10.20250416-2+rpi1~1^2~25^2~53 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=418e97e847f2de0cca96dc8fb62c8fb49070023c;p=git-annex.git fix build warnings on windows --- diff --git a/Utility/MoveFile.hs b/Utility/MoveFile.hs index c04dbea6d0..9f17bc87cc 100644 --- a/Utility/MoveFile.hs +++ b/Utility/MoveFile.hs @@ -64,7 +64,8 @@ moveFile src dest = tryIO (R.rename src dest) >>= onrename ] let e' = e #else - r <- tryIO $ copyFile (fromRawFilePath src) tmp + r <- tryIO $ copyright + =<< copyFile (fromRawFilePath src) tmp let (ok, e') = case r of Left err -> (False, err) Right _ -> (True, e) diff --git a/Utility/ThreadScheduler.hs b/Utility/ThreadScheduler.hs index 245605b0b4..9e0b620f87 100644 --- a/Utility/ThreadScheduler.hs +++ b/Utility/ThreadScheduler.hs @@ -18,9 +18,9 @@ module Utility.ThreadScheduler ( ) where import Control.Monad -import Control.Concurrent import qualified Control.Concurrent.Thread.Delay as Unbounded #ifndef mingw32_HOST_OS +import Control.Concurrent import Control.Monad.IfElse import System.Posix.IO #endif