From: sof Date: Mon, 18 Jun 2001 21:45:49 +0000 (+0000) Subject: [project @ 2001-06-18 21:45:49 by sof] X-Git-Tag: Approximately_9120_patches~1743 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=916214e4f401d70462654013e83c4b8b08e85a18;p=ghc-hetmet.git [project @ 2001-06-18 21:45:49 by sof] For GHCen < 5.00, assume that Exception.throwTo is Exception.raiseInThread --- diff --git a/ghc/compiler/main/Main.hs b/ghc/compiler/main/Main.hs index ebafe83..15ac137 100644 --- a/ghc/compiler/main/Main.hs +++ b/ghc/compiler/main/Main.hs @@ -1,6 +1,6 @@ {-# OPTIONS -fno-warn-incomplete-patterns #-} ----------------------------------------------------------------------------- --- $Id: Main.hs,v 1.73 2001/06/18 08:56:09 simonpj Exp $ +-- $Id: Main.hs,v 1.74 2001/06/18 21:45:49 sof Exp $ -- -- GHC Driver program -- @@ -59,18 +59,23 @@ import Directory ( doesFileExist ) import IOExts ( readIORef, writeIORef ) import Exception ( throwDyn, Exception(DynException) ) import System ( getArgs, exitWith, ExitCode(..) ) +import Monad +import List +import Maybe #ifndef mingw32_TARGET_OS import Concurrent ( myThreadId ) +#ifdef __GLASGOW_HASKELL__ < 500 +import Exception ( raiseInThread ) +#define throwTo raiseInThread +#else import Exception ( throwTo ) +#endif + import Posix ( Handler(Catch), installHandler, sigINT, sigQUIT ) import Dynamic ( toDyn ) #endif -import Monad -import List -import Maybe - ----------------------------------------------------------------------------- -- Changes: