Remove dependency on ghc-prim.

facundominguez · facundominguez · commit faeab848bba5 · 2016-06-09T08:38:54.000-03:00
diff --git a/distributed-process.cabal b/distributed-process.cabal
@@ -51,7 +51,6 @@ Library
                      data-accessor >= 0.2 && < 0.3,
                      bytestring >= 0.9 && < 0.11,
                      random >= 1.0 && < 1.2,
-                     ghc-prim >= 0.2 && < 0.6,
                      distributed-static >= 0.2 && < 0.4,
                      rank1dynamic >= 0.1 && < 0.4,
                      syb >= 0.3 && < 0.7,
diff --git a/src/Control/Distributed/Process/Internal/CQueue.hs b/src/Control/Distributed/Process/Internal/CQueue.hs
@@ -48,7 +48,7 @@ import Data.Maybe (fromJust)
 import Data.Traversable (traverse)
 import GHC.MVar (MVar(MVar))
 import GHC.IO (IO(IO), unIO)
-import GHC.Prim (mkWeak#)
+import GHC.Exts (mkWeak#)
 import GHC.Weak (Weak(Weak))
 
 -- We use a TCHan rather than a Chan so that we have a non-blocking read
@@ -266,7 +266,7 @@ dequeue (CQueue arrived incoming size) blockSpec matchons = mask_ $ decrementJus
 -- | Weak reference to a CQueue
 mkWeakCQueue :: CQueue a -> IO () -> IO (Weak (CQueue a))
 mkWeakCQueue m@(CQueue (StrictMVar (MVar m#)) _ _) f = IO $ \s ->
-#if MIN_VERSION_ghc_prim(0,5,0)
+#if MIN_VERSION_base(4,9,0)
   case mkWeak# m# m (unIO f) s of (# s1, w #) -> (# s1, Weak w #)
 #else
   case mkWeak# m# m f s of (# s1, w #) -> (# s1, Weak w #)
diff --git a/src/Control/Distributed/Process/Internal/StrictMVar.hs b/src/Control/Distributed/Process/Internal/StrictMVar.hs
@@ -37,7 +37,7 @@ import qualified Control.Concurrent.MVar as MVar
   )
 import GHC.MVar (MVar(MVar))
 import GHC.IO (IO(IO), unIO)
-import GHC.Prim (mkWeak#)
+import GHC.Exts (mkWeak#)
 import GHC.Weak (Weak(Weak))
 
 newtype StrictMVar a = StrictMVar (MVar.MVar a)
@@ -86,7 +86,7 @@ modifyMVarMasked (StrictMVar v) f =
 
 mkWeakMVar :: StrictMVar a -> IO () -> IO (Weak (StrictMVar a))
 mkWeakMVar q@(StrictMVar (MVar m#)) f = IO $ \s ->
-#if MIN_VERSION_ghc_prim(0,5,0)
+#if MIN_VERSION_base(4,9,0)
   case mkWeak# m# q (unIO f) s of (# s', w #) -> (# s', Weak w #)
 #else
   case mkWeak# m# q f s of (# s', w #) -> (# s', Weak w #)
diff --git a/src/Control/Distributed/Process/Internal/WeakTQueue.hs b/src/Control/Distributed/Process/Internal/WeakTQueue.hs
@@ -24,7 +24,7 @@ import Prelude hiding (read)
 import GHC.Conc
 import Data.Typeable (Typeable)
 import GHC.IO (IO(IO), unIO)
-import GHC.Prim (mkWeak#)
+import GHC.Exts (mkWeak#)
 import GHC.Weak (Weak(Weak))
 
 --------------------------------------------------------------------------------
@@ -100,7 +100,7 @@ isEmptyTQueue (TQueue read write) = do
 
 mkWeakTQueue :: TQueue a -> IO () -> IO (Weak (TQueue a))
 mkWeakTQueue q@(TQueue _read (TVar write#)) f = IO $ \s ->
-#if MIN_VERSION_ghc_prim(0,5,0)
+#if MIN_VERSION_base(4,9,0)
   case mkWeak# write# q (unIO f) s of (# s', w #) -> (# s', Weak w #)
 #else
   case mkWeak# write# q f s of (# s', w #) -> (# s', Weak w #)
