aboutsummaryrefslogtreecommitdiff
path: root/Command/Log.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-05-10 14:45:55 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-05-10 15:21:35 -0400
commitea506b28110d0e23210fb788b16ffe3deb92f23b (patch)
treee75cd9cbf7e45375f0619a97d2ffb62af3fe31ef /Command/Log.hs
parent0c7caf1e92eda1dde83b9fa95da5fc304ae2767d (diff)
support time-1.5.0
This no longer uses old-locale's defaultTimeLocale, but provides one of its own. Factored out a Logs.TimeStamp.
Diffstat (limited to 'Command/Log.hs')
-rw-r--r--Command/Log.hs6
1 files changed, 5 insertions, 1 deletions
diff --git a/Command/Log.hs b/Command/Log.hs
index 4bc7bb89a..e1438ba15 100644
--- a/Command/Log.hs
+++ b/Command/Log.hs
@@ -5,15 +5,19 @@
- Licensed under the GNU GPL version 3 or higher.
-}
+{-# LANGUAGE CPP #-}
+
module Command.Log where
import qualified Data.Set as S
import qualified Data.Map as M
import qualified Data.ByteString.Lazy.Char8 as L
+import Data.Char
import Data.Time.Clock.POSIX
import Data.Time
+#if ! MIN_VERSION_time(1,5,0)
import System.Locale
-import Data.Char
+#endif
import Common.Annex
import Command