git.iko.soy/typeable/wai
on master help sign in
removing unnecessary #if.
commitfe2ca5bda0f26e9fb3169cddfeb775842f00b633 authorKazu Yamamoto <kazu@iij.ad.jp> dateMon 24 Jul 2017, 11:54 (9 years ago) parent5a7bd88
2 files changed−18
compare with master
unifiedsplit
warp/Network/Wai/Handler/Warp/Response.hs−16 warp/Network/Wai/Handler/Warp/Timeout.hs−2
warp/Network/Wai/Handler/Warp/Response.hs−16
@@ -14,10 +14,6 @@ module Network.Wai.Handler.Warp.Response (
1414 , addServer -- testing
1515 ) where
1616
17−#ifndef MIN_VERSION_base
18−#define MIN_VERSION_base(x,y,z) 1
19−#endif
20−
2117import Blaze.ByteString.Builder.HTTP (chunkedTransferEncoding, chunkedTransferTerminator)
2218import qualified Control.Exception as E
2319import Control.Monad (unless, when)
@@ -31,14 +27,7 @@ import qualified Data.CaseInsensitive as CI
3127import Data.Function (on)
3228import Data.List (deleteBy)
3329import Data.Maybe
34−#if MIN_VERSION_base(4,5,0)
35−# if __GLASGOW_HASKELL__ < 709
36−import Data.Monoid (mempty)
37−# endif
3830import Data.Monoid ((<>))
39−#else
40−import Data.Monoid (mappend, mempty)
41−#endif
4231import Data.Streaming.Blaze (newBlazeRecv, reuseBufferStrategy)
4332import Data.Version (showVersion)
4433import Data.Word8 (_cr, _lf)
@@ -57,11 +46,6 @@ import Network.Wai.Handler.Warp.Types
5746import Network.Wai.Internal
5847import qualified Paths_warp
5948
60−#if !MIN_VERSION_base(4,5,0)
61−(<>) :: Monoid m => m -> m -> m
62−(<>) = mappend
63−#endif
64−
6549-- $setup
6650-- >>> :set -XOverloadedStrings
6751
warp/Network/Wai/Handler/Warp/Timeout.hs−2
@@ -112,10 +112,8 @@ registerKillThread m onTimeout = do
112112data TimeoutThread = TimeoutThread
113113 deriving Typeable
114114instance E.Exception TimeoutThread where
115−#if MIN_VERSION_base(4,7,0)
116115 toException = E.asyncExceptionToException
117116 fromException = E.asyncExceptionFromException
118−#endif
119117instance Show TimeoutThread where
120118 show TimeoutThread = "Thread killed by Warp's timeout reaper"
121119