summaryrefslogtreecommitdiff
path: root/src/System
diff options
context:
space:
mode:
authorjim@bo <jim@bo>2018-06-20 03:08:45 -0400
committerjim@bo <jim@bo>2018-06-20 18:00:29 -0400
commit07202340d82fddc32f1cad82a437a438565cc2ba (patch)
treea836218263b4cb45ab3cc39ddeee5d24619ab976 /src/System
parente1c7ba154a1010cf33ff4daa045d8f4542e2267c (diff)
port to newer versions of packages:
* iproute >= 1.7.4 * conduit-extra >= 1.1.7
Diffstat (limited to 'src/System')
-rw-r--r--src/System/Global6.hs5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/System/Global6.hs b/src/System/Global6.hs
index cc8ed020..f9073482 100644
--- a/src/System/Global6.hs
+++ b/src/System/Global6.hs
@@ -1,8 +1,13 @@
1{-# LANGUAGE CPP #-}
1module System.Global6 where 2module System.Global6 where
2 3
3import Control.Monad 4import Control.Monad
4import Control.Applicative 5import Control.Applicative
6#if MIN_VERSION_iproute(1,7,4)
7import Data.IP hiding (fromSockAddr)
8#else
5import Data.IP 9import Data.IP
10#endif
6import Data.List 11import Data.List
7import Data.Maybe 12import Data.Maybe
8import Network.Socket 13import Network.Socket