git.iko.soy/distributed-process
on master help sign in
Merge pull request #6 from acfoltzer/master
4e42a1eRyan Newton
distributed-process/src/Control/Distributed/Process.hs+9−3
@@ -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,8 +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)
32import qualified Data.IntMap as IntMap
30import qualified Data.IntMap as IntMap
33import Data.IntMap (IntMap)
31import Data.IntMap (IntMap)
34import Control.Applicative
32import Control.Applicative
@@ -41,6 +39,14 @@ import Data.Typeable
41
39
42import Debug.Trace
40import Debug.Trace
43
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+
44------------------------
50------------------------
45-- Cloud Haskell layer
51-- Cloud Haskell layer
46--
52--
examples/DemoTransport.hs+5−1
@@ -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,7 +9,11 @@ import Network.Transport.TCP (mkTransport, TCPConfig (..))
9import Control.Concurrent
9import Control.Concurrent
10import Control.Monad
10import Control.Monad
11
11
12+#ifndef LAZY
13+import qualified Data.ByteString.Char8 as BS
14+#else
12import qualified Data.ByteString.Lazy.Char8 as BS
15import qualified Data.ByteString.Lazy.Char8 as BS
16+#endif
13
17
14import Data.IORef
18import Data.IORef
15import Debug.Trace
19import Debug.Trace