summaryrefslogtreecommitdiff
path: root/Logs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-05-10 15:28:23 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-05-10 15:28:23 -0400
commit724e67bdf449120bdaf0ca695d49626e5249d446 (patch)
tree329243d8541c7b8f1fedbb93182689eb6e581174 /Logs
parenteed2e5427e2256adec4df9cdc7621b7e02ba0e34 (diff)
fix build warning with time 1.5
Diffstat (limited to 'Logs')
-rw-r--r--Logs/TimeStamp.hs4
1 files changed, 4 insertions, 0 deletions
diff --git a/Logs/TimeStamp.hs b/Logs/TimeStamp.hs
index 2832a3d65..121b76678 100644
--- a/Logs/TimeStamp.hs
+++ b/Logs/TimeStamp.hs
@@ -18,4 +18,8 @@ import System.Locale
import Common
parsePOSIXTime :: String -> Maybe POSIXTime
+#if MIN_VERSION_time(1,5,0)
+parsePOSIXTime s = utcTimeToPOSIXSeconds <$> parseTimeM True defaultTimeLocale "%s%Qs" s
+#else
parsePOSIXTime s = utcTimeToPOSIXSeconds <$> parseTime defaultTimeLocale "%s%Qs" s
+#endif