summaryrefslogtreecommitdiff
path: root/src/compiler/GF/Server.hs
diff options
context:
space:
mode:
authorhallgren <hallgren@chalmers.se>2015-02-16 15:05:06 +0000
committerhallgren <hallgren@chalmers.se>2015-02-16 15:05:06 +0000
commit54ae70a81e338fd05397ab22890b3ca36284be54 (patch)
treec6757f0c7f0d90a39329a2180ad1df33a99e384b /src/compiler/GF/Server.hs
parent2b8fe8ea7a4f40445889b80bd7f737d0078e7598 (diff)
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.
Diffstat (limited to 'src/compiler/GF/Server.hs')
-rw-r--r--src/compiler/GF/Server.hs4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/compiler/GF/Server.hs b/src/compiler/GF/Server.hs
index ce1c1fd0c..34a8c6e57 100644
--- a/src/compiler/GF/Server.hs
+++ b/src/compiler/GF/Server.hs
@@ -16,7 +16,11 @@ import GF.System.Directory(doesDirectoryExist,doesFileExist,createDirectory,
getDirectoryContents,removeFile,removeDirectory,
getModificationTime)
import Data.Time (getCurrentTime,formatTime)
+#if MIN_VERSION_time(1,5,0)
+import Data.Time.Format(defaultTimeLocale,rfc822DateFormat)
+#else
import System.Locale(defaultTimeLocale,rfc822DateFormat)
+#endif
import System.FilePath(dropExtension,takeExtension,takeFileName,takeDirectory,
(</>),makeRelative)
#ifndef mingw32_HOST_OS