summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--src/Localize.hsc4
-rw-r--r--src/Plugins/DateZone.hs4
2 files changed, 7 insertions, 1 deletions
diff --git a/src/Localize.hsc b/src/Localize.hsc
index 28f4495..b3f7d53 100644
--- a/src/Localize.hsc
+++ b/src/Localize.hsc
@@ -19,7 +19,11 @@ module Localize
) where
import Foreign.C
+#if ! MIN_VERSION_time(1,5,0)
import qualified System.Locale as L
+#else
+import qualified Data.Time.Format as L
+#endif
#ifdef UTF8
import Codec.Binary.UTF8.String
diff --git a/src/Plugins/DateZone.hs b/src/Plugins/DateZone.hs
index f1737fb..401e77c 100644
--- a/src/Plugins/DateZone.hs
+++ b/src/Plugins/DateZone.hs
@@ -31,12 +31,14 @@ import Control.Concurrent.STM
import System.IO.Unsafe
import Localize
-import Data.Time.LocalTime
import Data.Time.Format
+import Data.Time.LocalTime
import Data.Time.LocalTime.TimeZone.Olson
import Data.Time.LocalTime.TimeZone.Series
+#if ! MIN_VERSION_time(1,5,0)
import System.Locale (TimeLocale)
+#endif
#else
import System.IO
import Plugins.Date