update some patches for new versions
This commit is contained in:
parent
d915328b36
commit
eeb4182cb2
2 changed files with 48 additions and 17 deletions
|
@ -1,26 +1,26 @@
|
|||
From 5b14dd83f9ff1d187871fc7c6e956cad95bc4e9b Mon Sep 17 00:00:00 2001
|
||||
From: Joey Hess <joey@kitenet.net>
|
||||
Date: Fri, 19 Apr 2013 15:36:25 -0400
|
||||
From 63a7a97511266c1a9d2414d3314ee17fc88bb8f2 Mon Sep 17 00:00:00 2001
|
||||
From: dummy <dummy@example.com>
|
||||
Date: Fri, 18 Oct 2013 15:58:35 +0000
|
||||
Subject: [PATCH] configure misdetects accept4
|
||||
|
||||
---
|
||||
Network/Socket.hsc | 4 ++--
|
||||
Network/Socket.hsc | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Network/Socket.hsc b/Network/Socket.hsc
|
||||
index e6c0feb..49d090b 100644
|
||||
index 9af31f8..6c21209 100644
|
||||
--- a/Network/Socket.hsc
|
||||
+++ b/Network/Socket.hsc
|
||||
@@ -505,7 +505,7 @@ accept sock@(MkSocket s family stype protocol status) = do
|
||||
@@ -503,7 +503,7 @@ accept sock@(MkSocket s family stype protocol status) = do
|
||||
return new_sock
|
||||
#else
|
||||
with (fromIntegral sz) $ \ ptr_len -> do
|
||||
new_sock <-
|
||||
-# ifdef HAVE_ACCEPT4
|
||||
+# if 0
|
||||
throwSocketErrorIfMinus1RetryMayBlock "accept"
|
||||
+#if 0
|
||||
new_sock <- throwSocketErrorIfMinus1RetryMayBlock "accept"
|
||||
(threadWaitRead (fromIntegral s))
|
||||
(c_accept4 s sockaddr ptr_len (#const SOCK_NONBLOCK))
|
||||
@@ -1589,7 +1589,7 @@ foreign import CALLCONV SAFE_ON_WIN "connect"
|
||||
@@ -1615,7 +1615,7 @@ foreign import CALLCONV SAFE_ON_WIN "connect"
|
||||
c_connect :: CInt -> Ptr SockAddr -> CInt{-CSockLen???-} -> IO CInt
|
||||
foreign import CALLCONV unsafe "accept"
|
||||
c_accept :: CInt -> Ptr SockAddr -> Ptr CInt{-CSockLen???-} -> IO CInt
|
||||
|
@ -30,5 +30,5 @@ index e6c0feb..49d090b 100644
|
|||
c_accept4 :: CInt -> Ptr SockAddr -> Ptr CInt{-CSockLen???-} -> CInt -> IO CInt
|
||||
#endif
|
||||
--
|
||||
1.8.2.rc3
|
||||
1.7.10.4
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue