1 files changed, 21 insertions, 1 deletions

diff --git a/src/Network/SocketLike.hs b/src/Network/SocketLike.hs
index 2aa78e3e..d533dd7f 100644
--- a/src/Network/SocketLike.hs
+++ b/src/Network/SocketLike.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE CPP #-}
 -- |
 --
 -- A socket could be used indirectly via a 'System.IO.Handle' or a conduit from
@@ -68,14 +69,24 @@ instance SocketLike NS.Socket where
     getPeerName   = NS.getPeerName
     getPeerCred   = NS.getPeerCred
     socketPort    = NS.socketPort
+#if MIN_VERSION_network(2,4,0)
+    sIsConnected  = NS.isConnected -- warning: this is always False if the socket
+                                   --          was converted to a Handle
+    sIsBound      = NS.isBound
+    sIsListening  = NS.isListening
+    sIsReadable   = NS.isReadable
+    sIsWritable   = NS.isWritable
+    sClose        = NS.close
+#else
     sIsConnected  = NS.sIsConnected -- warning: this is always False if the socket
                                     --          was converted to a Handle
     sIsBound      = NS.sIsBound
     sIsListening  = NS.sIsListening
     sIsReadable   = NS.sIsReadable
     sIsWritable   = NS.sIsWritable
-
     sClose        = NS.sClose
+#endif
+
 
 -- | An encapsulated socket.  Data reads and writes are not possible.
 data RestrictedSocket = Restricted (Maybe Handle) NS.Socket deriving Show
@@ -85,12 +96,21 @@ instance SocketLike RestrictedSocket where
     getPeerName   (Restricted mb sock) = NS.getPeerName sock
     getPeerCred   (Restricted mb sock) = NS.getPeerCred sock
     socketPort    (Restricted mb sock) = NS.socketPort sock
+#if MIN_VERSION_network(2,4,0)
+    sIsConnected  (Restricted mb sock) = maybe (NS.isConnected sock) (hIsOpen) mb
+    sIsBound      (Restricted mb sock) = NS.isBound sock
+    sIsListening  (Restricted mb sock) = NS.isListening sock
+    sIsReadable   (Restricted mb sock) = NS.isReadable sock
+    sIsWritable   (Restricted mb sock) = NS.isWritable sock
+    sClose        (Restricted mb sock) = maybe (NS.close sock) (\h -> hClose h >> NS.close sock) mb
+#else
     sIsConnected  (Restricted mb sock) = maybe (NS.sIsConnected sock) (hIsOpen) mb
     sIsBound      (Restricted mb sock) = NS.sIsBound sock
     sIsListening  (Restricted mb sock) = NS.sIsListening sock
     sIsReadable   (Restricted mb sock) = NS.sIsReadable sock
     sIsWritable   (Restricted mb sock) = NS.sIsWritable sock
     sClose        (Restricted mb sock) = maybe (NS.sClose sock) (\h -> hClose h >> NS.sClose sock) mb
+#endif
 
 -- | Create a 'RestrictedSocket' that explicitly disallows sending or
 -- receiving data.