git.iko.soy/distributed-process
on master help sign in
Merge branch 'master' of github.com:haskell-distributed/distributed-process
699ff8fRyan Newton
distributed-process/src/Control/Distributed/Process.hs+9−5
compare with master
unifiedsplit
@@ -1,4 +1,4 @@
1−{-# LANGUAGE ExplicitForAll, ScopedTypeVariables #-}
1+{-# LANGUAGE CPP, ExplicitForAll, ScopedTypeVariables #-}
2
2
3module Control.Distributed.Process (
3module Control.Distributed.Process (
4 -- * Processes
4 -- * Processes
@@ -27,10 +27,6 @@ module Control.Distributed.Process (
27import qualified Network.Transport as Trans
27import qualified Network.Transport as Trans
28import Network.Transport (Transport)
28import Network.Transport (Transport)
29
29
30−-- import qualified Data.ByteString.Lazy.Char8 as BS
31−-- import Data.ByteString.Lazy.Char8 (ByteString)
32−import qualified Data.ByteString.Char8 as BS
33−import Data.ByteString.Char8 (ByteString)
34import qualified Data.IntMap as IntMap
30import qualified Data.IntMap as IntMap
35import Data.IntMap (IntMap)
31import Data.IntMap (IntMap)
36import Control.Applicative
32import Control.Applicative
@@ -43,6 +39,14 @@ import Data.Typeable
43
39
44import Debug.Trace
40import Debug.Trace
45
41
42+#ifndef LAZY
43+import qualified Data.ByteString.Char8 as BS
44+import Data.ByteString.Char8 (ByteString)
45+#else
46+import qualified Data.ByteString.Lazy.Char8 as BS
47+import Data.ByteString.Lazy.Char8 (ByteString)
48+#endif
49+
46------------------------
50------------------------
47-- Cloud Haskell layer
51-- Cloud Haskell layer
48--
52--
examples/DemoTransport.hs+5−2
@@ -1,4 +1,4 @@
1−{-# LANGUAGE NamedFieldPuns #-}
1+{-# LANGUAGE CPP, NamedFieldPuns #-}
2module Main where
2module Main where
3
3
4import Network.Transport
4import Network.Transport
@@ -9,8 +9,11 @@ import Network.Transport.TCP (mkTransport, TCPConfig (..))
9import Control.Concurrent
9import Control.Concurrent
10import Control.Monad
10import Control.Monad
11
11
12−-- import qualified Data.ByteString.Lazy.Char8 as BS
12+#ifndef LAZY
13import qualified Data.ByteString.Char8 as BS
13import qualified Data.ByteString.Char8 as BS
14+#else
15+import qualified Data.ByteString.Lazy.Char8 as BS
16+#endif
14
17
15import Data.IORef
18import Data.IORef
16import Debug.Trace
19import Debug.Trace