summaryrefslogtreecommitdiff
path: root/libraries/base/Control/Exception
diff options
context:
space:
mode:
authorSimon Marlow <marlowsd@gmail.com>2010-08-10 08:22:48 +0000
committerSimon Marlow <marlowsd@gmail.com>2010-08-10 08:22:48 +0000
commit43583aaa142662346da9ea010835d5eb58aceba1 (patch)
tree68f3024576f9d98ec993b7f4bc5d8611880e2c86 /libraries/base/Control/Exception
parent41fe4e3ef79747e43c5e7f6c6fb6690e455fbc3c (diff)
downloadhaskell-43583aaa142662346da9ea010835d5eb58aceba1.tar.gz
Integrated new I/O manager
(patch originally by Johan Tibell <johan.tibell@gmail.com>, minor merging by me)
Diffstat (limited to 'libraries/base/Control/Exception')
-rw-r--r--libraries/base/Control/Exception/Base.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/libraries/base/Control/Exception/Base.hs b/libraries/base/Control/Exception/Base.hs
index 525dc6af9d..1dc668b398 100644
--- a/libraries/base/Control/Exception/Base.hs
+++ b/libraries/base/Control/Exception/Base.hs
@@ -120,7 +120,7 @@ import GHC.IO.Exception
import GHC.Exception
import GHC.Show
-- import GHC.Exception hiding ( Exception )
-import GHC.Conc
+import GHC.Conc.Sync
#endif
#ifdef __HUGS__