Port commit afe40dd4 to newer network library

1 files changed, 7 insertions, 1 deletions

diff --git a/dht/src/Network/QueryResponse.hs b/dht/src/Network/QueryResponse.hs
index f72763de..27134470 100644
--- a/dht/src/Network/QueryResponse.hs
+++ b/dht/src/Network/QueryResponse.hs
@@ -548,7 +548,9 @@ sockAddrFamily :: SockAddr -> Family
 sockAddrFamily (SockAddrInet  _ _    ) = AF_INET
 sockAddrFamily (SockAddrInet6 _ _ _ _) = AF_INET6
 sockAddrFamily (SockAddrUnix  _      ) = AF_UNIX
+#if !MIN_VERSION_network(3,0,0)
 sockAddrFamily _                       = AF_CAN -- SockAddrCan constructor deprecated
+#endif
 
 -- | Packets with an empty payload may trigger EOF exception.
 -- 'udpTransport' uses this function to avoid throwing in that
@@ -619,8 +621,12 @@ udpTransport' bind_address = do
         -- close sock
         tryTakeMVar isClosed >> putMVar isClosed ()
         -- set O_NONBLOCK using fcntl
+        -- NOTE: setNonBlockIfNeeded is a no-op on windows
+#if MIN_VERSION_network (3,1,0)
+        withFdSocket sock $ \fd -> setNonBlockIfNeeded fd
+#else
         setNonBlockIfNeeded (fdSocket sock) -- setSocketOption sock ??? 0
-
+#endif
     }
   return (tr, sock)