fd3d4e5 · streamly · git.iko.soy

src/Streamly/Network/Socket.hs+10−1

compare with master

unifiedsplit

@@ -75,9 +75,14 @@ import Foreign.Ptr (minusPtr, plusPtr, Ptr, castPtr)

75import Foreign.Storable (Storable(..))

76import GHC.ForeignPtr (mallocPlainForeignPtrBytes)

77import Network.Socket

78− (withFdSocket, Socket, PortNumber, SocketOption(..), Family(..),

78+ (Socket, PortNumber, SocketOption(..), Family(..),

79 SockAddr(..), withSocketsDo, SocketType(..), socket, accept, bind,

80 defaultProtocol, setSocketOption, maxListenQueue, sendBuf, recvBuf)

81+#if MIN_VERSION_network(3,1,0)

82+import Network.Socket (withFdSocket)

83+#else

84+import Network.Socket (fdSocket)

85+#endif

81import Prelude hiding (read)

86import Prelude hiding (read)

82

87

83import qualified Network.Socket as Net

88import qualified Network.Socket as Net

@@ -181,7 +186,11 @@ readArrayUpto = readArrayUptoWith recvBuf

181

186

182waitWhen0 :: Int -> Socket -> IO ()

187waitWhen0 :: Int -> Socket -> IO ()

183waitWhen0 0 s = when rtsSupportsBoundThreads $

188waitWhen0 0 s = when rtsSupportsBoundThreads $

189+#if MIN_VERSION_network(3,1,0)

184 withFdSocket s $ \fd -> threadWaitWrite $ fromIntegral fd

190 withFdSocket s $ \fd -> threadWaitWrite $ fromIntegral fd

191+#else

192+ let fd = fdSocket s in threadWaitWrite $ fromIntegral fd

193+#endif

185waitWhen0 _ _ = return ()

194waitWhen0 _ _ = return ()

186

195

187sendAll :: Socket -> Ptr Word8 -> Int -> IO ()

196sendAll :: Socket -> Ptr Word8 -> Int -> IO ()

stack-7.10.yaml+1−1

@@ -12,7 +12,7 @@ extra-deps:

12 - basement-0.0.7

13 - deepseq-1.4.4.0

14 - typed-process-0.2.4.0@sha256:fb1574481a394bec4f49016fc42f2404cea4acf5b129329459dae5e416da560e

15− - network-3.1.0.0@sha256:85b36fea1dfe92af91b38224d6ea84eb0b17c03d9aed0260413be226722b0cd2

15+ - network-2.6.3.6@sha256:1ca79d81af02d7acd6032d5e6c9bde4618a8fdcfbe19bd42b49d420183975df0

16

17flags: {}

18extra-package-dbs: []

streamly.cabal+1−1

@@ -266,7 +266,7 @@ library

266 , mtl >= 2.2 && < 3

267 , transformers >= 0.4 && < 0.6

268 , transformers-base >= 0.4 && < 0.5

269− , network >= 3.1 && < 4

269+ , network >= 2.6 && < 4

270

271 if impl(ghc < 8.0)

272 build-depends: