aboutsummaryrefslogtreecommitdiff
path: root/Annex/Ingest.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-02-15 11:47:33 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-02-15 11:47:33 -0400
commitcd8e2e4eeb70d22f9a7daa375474d80aa188574b (patch)
tree6b3f01c14a5b64e40c15210d3baf916825a47dcb /Annex/Ingest.hs
parent98a2b312fd0297dcb09f6efdc3bd2e3b05b6dfc0 (diff)
move old ghc compat code into separate module; eliminate WITH_CLIBS
This avoids hsc2hs being run except when building for the old version of ghc. Should speed up builds.
Diffstat (limited to 'Annex/Ingest.hs')
-rw-r--r--Annex/Ingest.hs12
1 files changed, 1 insertions, 11 deletions
diff --git a/Annex/Ingest.hs b/Annex/Ingest.hs
index 0dd8b5967..68db3eef0 100644
--- a/Annex/Ingest.hs
+++ b/Annex/Ingest.hs
@@ -5,8 +5,6 @@
- Licensed under the GNU GPL version 3 or higher.
-}
-{-# LANGUAGE CPP #-}
-
module Annex.Ingest (
LockedDown(..),
LockDownConfig(..),
@@ -38,13 +36,9 @@ import Utility.InodeCache
import Annex.ReplaceFile
import Utility.Tmp
import Utility.CopyFile
+import Utility.Touch
import Git.FilePath
import Annex.InodeSentinal
-#ifdef WITH_CLIBS
-#ifndef __ANDROID__
-import Utility.Touch
-#endif
-#endif
import Control.Exception (IOException)
@@ -260,11 +254,7 @@ makeLink file key mcache = flip catchNonAsync (restoreFile file key) $ do
-- touch symlink to have same time as the original file,
-- as provided in the InodeCache
case mcache of
-#if defined(WITH_CLIBS) && ! defined(__ANDROID__)
Just c -> liftIO $ touch file (TimeSpec $ inodeCacheToMtime c) False
-#else
- Just _ -> noop
-#endif
Nothing -> noop
return l