Merge pull request haskell#19 from mainland/master

Fix compilation with GHC HEAD.
curiousleo · Sep 16, 2014 · 279163e · 279163e
2 parents 922855f + 7476569
commit 279163e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/System/Random.hs b/System/Random.hs
@@ -93,10 +93,11 @@ import Data.Ratio       ( numerator, denominator )
 #endif
 import Data.Char	( isSpace, chr, ord )
 import System.IO.Unsafe ( unsafePerformIO )
-import Data.IORef       ( IORef, atomicModifyIORef, newIORef, readIORef
-                        , writeIORef )
+import Data.IORef       ( IORef, newIORef, readIORef, writeIORef )
 #if MIN_VERSION_base (4,6,0)
 import Data.IORef       ( atomicModifyIORef' )
+#else
+import Data.IORef       ( atomicModifyIORef )
 #endif
 import Numeric		( readDec )
 

diff --git a/tests/random1283.hs b/tests/random1283.hs
@@ -1,5 +1,5 @@
 import Control.Concurrent
-import Control.Monad
+import Control.Monad hiding (empty)
 import Data.Sequence (ViewL(..), empty, fromList, viewl, (<|), (|>), (><))
 import System.Random