avoid warning when built with unix-compat 0.5.3

It re-exports modificationTimeHiRes, and provides a windows version.

Might be worth using that windows version eventually, but I have not
tested it.

diff --git a/Annex/Content/PointerFile.hs b/Annex/Content/PointerFile.hs
index 0ce60ef06e99d5286742c10442d181889f2bd765..10a6b3b2cc270dfd96946f2ad55827b840e1a0ce 100644 (file)
--- a/Annex/Content/PointerFile.hs
+++ b/Annex/Content/PointerFile.hs
@@ -19,7 +19,7 @@ import Utility.InodeCache
 import qualified Utility.RawFilePath as R
 #if ! defined(mingw32_HOST_OS)
 import Utility.Touch
-import System.Posix.Files (modificationTimeHiRes)
+import qualified System.Posix.Files as Posix
 #endif
 
 {- Populates a pointer file with the content of a key. 
@@ -66,7 +66,7 @@ depopulatePointerFile key file = do
                -- by git in some cases.
                liftIO $ maybe noop
                        (\t -> touch tmp' t False)
-                       (fmap modificationTimeHiRes st)
+                       (fmap Posix.modificationTimeHiRes st)
 #endif
                withTSDelta (liftIO . genInodeCache (toRawFilePath tmp))
        maybe noop (restagePointerFile (Restage True) file) ic

diff --git a/Command/Fix.hs b/Command/Fix.hs
index da2f5dd4ce36718347b18fa840f1f47a24414729..109b17389e6e6991306797914148e8db84889c51 100644 (file)
--- a/Command/Fix.hs
+++ b/Command/Fix.hs
@@ -21,7 +21,7 @@ import qualified Utility.RawFilePath as R
 
 #if ! defined(mingw32_HOST_OS)
 import Utility.Touch
-import System.Posix.Files
+import qualified System.Posix.Files as Posix
 #endif
 
 cmd :: Command
@@ -94,7 +94,7 @@ fixSymlink :: RawFilePath -> RawFilePath -> CommandPerform
 fixSymlink file link = do
 #if ! defined(mingw32_HOST_OS)
        -- preserve mtime of symlink
-       mtime <- liftIO $ catchMaybeIO $ modificationTimeHiRes
+       mtime <- liftIO $ catchMaybeIO $ Posix.modificationTimeHiRes
                <$> R.getSymbolicLinkStatus file
 #endif
        createWorkTreeDirectory (parentDir file)

diff --git a/Utility/InodeCache.hs b/Utility/InodeCache.hs
index 9a21c632add13796fddf7e96d7d5c2802628fdc7..266b739735e60d292007749031a6d363938ff178 100644 (file)
--- a/Utility/InodeCache.hs
+++ b/Utility/InodeCache.hs
@@ -55,7 +55,7 @@ import Data.Time.Clock.POSIX
 #ifdef mingw32_HOST_OS
 import Data.Word (Word64)
 #else
-import System.Posix.Files
+import qualified System.Posix.Files as Posix
 #endif
 
 data InodeCachePrim = InodeCachePrim FileID FileSize MTime
@@ -200,7 +200,7 @@ toInodeCache' (TSDelta getdelta) f s inode
 #ifdef mingw32_HOST_OS
                mtime <- utcTimeToPOSIXSeconds <$> getModificationTime (fromRawFilePath f)
 #else
-               let mtime = modificationTimeHiRes s
+               let mtime = Posix.modificationTimeHiRes s
 #endif
                return $ Just $ InodeCache $ InodeCachePrim inode sz (MTimeHighRes (mtime + highResTime delta))
        | otherwise = pure Nothing