From 54ae70a81e338fd05397ab22890b3ca36284be54 Mon Sep 17 00:00:00 2001 From: hallgren Date: Mon, 16 Feb 2015 15:05:06 +0000 Subject: Changes for compatibility with ghc-7.10-rc2 2 modules: Name clashes caused by Applicative-Monad change in Prelude 2 modules: Ambiguities caused by Foldable/Traversable in Prelude 2 modules: Backwards incompatible changes in time-1.5 for defaultTimeLocale 9 modules: {-# LANGUAGE FlexibleContexts #-} (because GHC checks inferred types now, in addition to explicitly given type signatures) Also silenced warnings about tab characters in source files. --- src/server/PGFService.hs | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/server') diff --git a/src/server/PGFService.hs b/src/server/PGFService.hs index b2fd4fc89..c1431fbd9 100644 --- a/src/server/PGFService.hs +++ b/src/server/PGFService.hs @@ -21,7 +21,11 @@ import qualified PGF2 as C import Data.Time.Clock(UTCTime) import Data.Time.Format(formatTime) +#if MIN_VERSION_time(1,5,0) +import Data.Time.Format(defaultTimeLocale,rfc822DateFormat) +#else import System.Locale(defaultTimeLocale,rfc822DateFormat) +#endif import Text.JSON import Text.PrettyPrint as PP(render, text, (<+>)) import qualified Codec.Binary.UTF8.String as UTF8 (decodeString) -- cgit v1.2.3