diff options
author | 2013-10-18 16:19:22 -0400 | |
---|---|---|
committer | 2013-10-18 16:19:22 -0400 | |
commit | a2188fcadeca170db6847b2485f1c36d8af5f6d6 (patch) | |
tree | decb70f180862caa98438a9a50ce5b573b049e9f /standalone/android/haskell-patches/network_2.4.1.0_0003-configure-misdetects-accept4.patch | |
parent | 2849d9a895269d15eccbf9e93df33dca8373d1eb (diff) |
update some patches for new versions
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 | 22 |
1 files changed, 11 insertions, 11 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 9be862b5a..116fa320e 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 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 |