on master help sign in
Merge pull request #353 from RyanGlScott/master

Fix Windows build with time-1.5

commit77d93087e42982a0a70bcd11c3ff0ecd9723a3b1 authorMichael Snoyman <michael@snoyman.com> dateSat 28 Mar 2015, 21:02 (12 years ago) parentf33eb3f0c4887e
1 file changed+6−2
warp/Network/Wai/Handler/Warp/Date.hs+6−2
warp/Network/Wai/Handler/Warp/Date.hs+6−2
@@ -12,8 +12,12 @@ import Control.AutoUpdate (defaultUpdateSettings, updateAction, mkAutoUpdate)
1212import Data.ByteString.Char8
1313
1414#if WINDOWS
15−import Data.Time
16−import System.Locale
15+import Data.Time (formatTime, getCurrentTime)
16+# if MIN_VERSION_time(1,5,0)
17+import Data.Time (defaultTimeLocale)
18+# else
19+import System.Locale (defaultTimeLocale)
20+# endif
1721#else
1822import Network.HTTP.Date
1923import System.Posix (epochTime)