summaryrefslogtreecommitdiff
path: root/standalone/android/haskell-patches/network-2.4.1.0_0003-configure-misdetects-accept4.patch
diff options
context:
space:
mode:
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.patch34
1 files changed, 34 insertions, 0 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
new file mode 100644
index 000000000..9be862b5a
--- /dev/null
+++ b/standalone/android/haskell-patches/network-2.4.1.0_0003-configure-misdetects-accept4.patch
@@ -0,0 +1,34 @@
+From 5b14dd83f9ff1d187871fc7c6e956cad95bc4e9b Mon Sep 17 00:00:00 2001
+From: Joey Hess <joey@kitenet.net>
+Date: Fri, 19 Apr 2013 15:36:25 -0400
+Subject: [PATCH] configure misdetects accept4
+
+---
+ 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
+--- a/Network/Socket.hsc
++++ b/Network/Socket.hsc
+@@ -505,7 +505,7 @@ accept sock@(MkSocket s family stype protocol status) = do
+ #else
+ with (fromIntegral sz) $ \ ptr_len -> do
+ new_sock <-
+-# ifdef HAVE_ACCEPT4
++# if 0
+ 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"
+ c_connect :: CInt -> Ptr SockAddr -> CInt{-CSockLen???-} -> IO CInt
+ foreign import CALLCONV unsafe "accept"
+ c_accept :: CInt -> Ptr SockAddr -> Ptr CInt{-CSockLen???-} -> IO CInt
+-#ifdef HAVE_ACCEPT4
++#if 0
+ foreign import CALLCONV unsafe "accept4"
+ c_accept4 :: CInt -> Ptr SockAddr -> Ptr CInt{-CSockLen???-} -> CInt -> IO CInt
+ #endif
+--
+1.8.2.rc3
+