git.iko.soy/distributed-process
on master help sign in
Merge branch 'master' of github.com:haskell-distributed/distributed-process

Conflicts: distributed-process/src/Control/Distributed/Process.hs examples/DemoTransport.hs

commit699ff8fcdf23a68624f157726f3d1ded3055a272 authorRyan Newton <rrnewton@gmail.com> dateSat 25 Feb 2012, 05:36 (15 years ago) parent48e257a4e42a1e
2 files changed+14−7
compare with master
unifiedsplit
distributed-process/src/Control/Distributed/Process.hs+9−5 examples/DemoTransport.hs+5−2
distributed-process/src/Control/Distributed/Process.hs+9−5
@@ -1,4 +1,4 @@
1−{-# LANGUAGE ExplicitForAll, ScopedTypeVariables #-}
1+{-# LANGUAGE CPP, ExplicitForAll, ScopedTypeVariables #-}
22
33module Control.Distributed.Process (
44 -- * Processes
@@ -27,10 +27,6 @@ module Control.Distributed.Process (
2727import qualified Network.Transport as Trans
2828import Network.Transport (Transport)
2929
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)
3430import qualified Data.IntMap as IntMap
3531import Data.IntMap (IntMap)
3632import Control.Applicative
@@ -43,6 +39,14 @@ import Data.Typeable
4339
4440import Debug.Trace
4541
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+
4650------------------------
4751-- Cloud Haskell layer
4852--
examples/DemoTransport.hs+5−2
@@ -1,4 +1,4 @@
1−{-# LANGUAGE NamedFieldPuns #-}
1+{-# LANGUAGE CPP, NamedFieldPuns #-}
22module Main where
33
44import Network.Transport
@@ -9,8 +9,11 @@ import Network.Transport.TCP (mkTransport, TCPConfig (..))
99import Control.Concurrent
1010import Control.Monad
1111
12−-- import qualified Data.ByteString.Lazy.Char8 as BS
12+#ifndef LAZY
1313import qualified Data.ByteString.Char8 as BS
14+#else
15+import qualified Data.ByteString.Lazy.Char8 as BS
16+#endif
1417
1518import Data.IORef
1619import Debug.Trace