diff options
Diffstat (limited to 'standalone/android/haskell-patches/network_2.4.1.0_0003-configure-misdetects-accept4.patch')
| -rw-r--r-- | standalone/android/haskell-patches/network_2.4.1.0_0003-configure-misdetects-accept4.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/standalone/android/haskell-patches/network_2.4.1.0_0003-configure-misdetects-accept4.patch b/standalone/android/haskell-patches/network_2.4.1.0_0003-configure-misdetects-accept4.patch index 116fa320e..084d355ba 100644 --- a/standalone/android/haskell-patches/network_2.4.1.0_0003-configure-misdetects-accept4.patch +++ b/standalone/android/haskell-patches/network_2.4.1.0_0003-configure-misdetects-accept4.patch @@ -1,26 +1,26 @@ -From 63a7a97511266c1a9d2414d3314ee17fc88bb8f2 Mon Sep 17 00:00:00 2001 +From 478fc7ae42030c1345e75727e54e1f8f895d3e22 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 +Date: Wed, 15 Oct 2014 15:16:21 +0000 +Subject: [PATCH] avoid 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 9af31f8..6c21209 100644 +index 2fe62ee..94db7a4 100644 --- a/Network/Socket.hsc +++ b/Network/Socket.hsc -@@ -503,7 +503,7 @@ accept sock@(MkSocket s family stype protocol status) = do - return new_sock +@@ -511,7 +511,7 @@ accept sock@(MkSocket s family stype protocol status) = do #else with (fromIntegral sz) $ \ ptr_len -> do + new_sock <- -# ifdef HAVE_ACCEPT4 +#if 0 - new_sock <- throwSocketErrorIfMinus1RetryMayBlock "accept" + throwSocketErrorIfMinus1RetryMayBlock "accept" (threadWaitRead (fromIntegral s)) (c_accept4 s sockaddr ptr_len (#const SOCK_NONBLOCK)) -@@ -1615,7 +1615,7 @@ foreign import CALLCONV SAFE_ON_WIN "connect" +@@ -1602,7 +1602,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 9af31f8..6c21209 100644 c_accept4 :: CInt -> Ptr SockAddr -> Ptr CInt{-CSockLen???-} -> CInt -> IO CInt #endif -- -1.7.10.4 +2.1.1 |