From ff0bcafc9586a7269440013d1f4716e95c42ed7d Mon Sep 17 00:00:00 2001 From: "Malcolm.Wallace" Date: Mon, 28 Jul 2008 16:45:06 +0000 Subject: [PATCH] disambiguate Control.Exception.catch for nhc98 --- Distribution/Simple/GHC.hs | 3 ++- Distribution/Simple/Program.hs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Distribution/Simple/GHC.hs b/Distribution/Simple/GHC.hs index 8594b75d3ff..8ac57212139 100644 --- a/Distribution/Simple/GHC.hs +++ b/Distribution/Simple/GHC.hs @@ -127,8 +127,9 @@ import System.Exit ( ExitCode(..) ) import System.FilePath ( (), (<.>), takeExtension, takeDirectory, replaceExtension, splitExtension ) import System.IO (openFile, IOMode(WriteMode), hClose, hPutStrLn) +import qualified Control.Exception as Exception (catch) import Control.Exception as Exception - ( catch, handle, try, Exception(..) ) + ( handle, try, Exception(..) ) -- ----------------------------------------------------------------------------- -- Configuring diff --git a/Distribution/Simple/Program.hs b/Distribution/Simple/Program.hs index 1f5f46e61b6..1391d5637d9 100644 --- a/Distribution/Simple/Program.hs +++ b/Distribution/Simple/Program.hs @@ -105,7 +105,7 @@ import Distribution.Verbosity import System.Directory ( doesFileExist, findExecutable ) import Control.Monad (join, foldM) -import Control.Exception as Exception (catch) +import qualified Control.Exception as Exception (catch) -- | Represents a program which can be configured. data Program = Program {