diff options
| author | Edward Tjörnhammar <ed@cflags.cc> | 2015-04-14 17:28:56 +0200 |
|---|---|---|
| committer | Edward Tjörnhammar <ed@cflags.cc> | 2015-04-14 18:10:15 +0200 |
| commit | ff0abce451e73c5911602ac4cfb672f64635fa08 (patch) | |
| tree | 9c698b9f2ea09dbf79c02e2851aa93f56ec6ad49 | |
| parent | 7b891200c17a501ed1641a1300164785f5898a22 (diff) | |
| download | xmobar-ff0abce451e73c5911602ac4cfb672f64635fa08.tar.gz xmobar-ff0abce451e73c5911602ac4cfb672f64635fa08.tar.bz2 | |
De-ambiguify TimeLocale when DateZone is enabled
| -rw-r--r-- | src/Localize.hsc | 4 | ||||
| -rw-r--r-- | src/Plugins/DateZone.hs | 4 |
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 |