aboutsummaryrefslogtreecommitdiff
path: root/graphics/hs-HGL/files/patch-Graphics__HGL__Internals__Utilities.hs
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/hs-HGL/files/patch-Graphics__HGL__Internals__Utilities.hs')
-rw-r--r--graphics/hs-HGL/files/patch-Graphics__HGL__Internals__Utilities.hs20
1 files changed, 18 insertions, 2 deletions
diff --git a/graphics/hs-HGL/files/patch-Graphics__HGL__Internals__Utilities.hs b/graphics/hs-HGL/files/patch-Graphics__HGL__Internals__Utilities.hs
index 0b03fe9d5ceb..d09a4cb11689 100644
--- a/graphics/hs-HGL/files/patch-Graphics__HGL__Internals__Utilities.hs
+++ b/graphics/hs-HGL/files/patch-Graphics__HGL__Internals__Utilities.hs
@@ -1,11 +1,27 @@
--- ./Graphics/HGL/Internals/Utilities.hs.orig 2009-11-03 15:50:11.000000000 +0100
-+++ ./Graphics/HGL/Internals/Utilities.hs 2011-03-13 18:31:25.754332789 +0100
++++ ./Graphics/HGL/Internals/Utilities.hs 2013-05-01 01:30:47.000000000 +0200
@@ -20,7 +20,7 @@
modMVar, modMVar_
) where
-import qualified Control.Exception as E (bracket, try, IOException, tryJust, ioErrors)
-+import qualified Control.OldException as E (bracket, try, IOException, tryJust, ioErrors)
++import qualified Control.Exception as E (bracket, try, IOException, tryJust)
import Control.Concurrent( MVar, takeMVar, putMVar )
bracket :: IO a -> (a -> IO b) -> (a -> IO c) -> IO c
+@@ -32,15 +32,7 @@
+
+ type Exception = E.IOException
+ safeTry :: IO a -> IO (Either Exception a)
+-
+-#if __GLASGOW_HASKELL >= 610
+--- ghc-6.10
+ safeTry = E.try
+-#else
+--- ghc 6.8 (and below?)
+-safeTry = E.tryJust E.ioErrors
+-#endif
+-
+
+ ----------------------------------------------------------------
+ -- Utilities