From 29c6b46868a0c8f4299985625bcda273359b94f6 Mon Sep 17 00:00:00 2001 From: simonmar Date: Tue, 31 Jul 2001 12:51:37 +0000 Subject: [PATCH] [project @ 2001-07-31 12:51:37 by simonmar] merge ghc/lib/std/PrelTopHandler.lhs rev. 1.3 --- GHC/TopHandler.lhs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/GHC/TopHandler.lhs b/GHC/TopHandler.lhs index 18e807a..bcad168 100644 --- a/GHC/TopHandler.lhs +++ b/GHC/TopHandler.lhs @@ -1,5 +1,5 @@ -- ----------------------------------------------------------------------------- --- $Id: TopHandler.lhs,v 1.1 2001/06/28 14:15:03 simonmar Exp $ +-- $Id: TopHandler.lhs,v 1.2 2001/07/31 12:51:37 simonmar Exp $ -- -- (c) The University of Glasgow, 2001 -- @@ -64,13 +64,12 @@ reportError :: Bool -> String -> IO () reportError bombOut str = do (hFlush stdout) `catchException` (\ _ -> return ()) withCStringLen str $ \(cstr,len) -> do - writeErrString addrOf_ErrorHdrHook cstr len + writeErrString errorHdrHook cstr len if bombOut then stg_exit 1 else return () -foreign import ccall "addrOf_ErrorHdrHook" unsafe - addrOf_ErrorHdrHook :: Ptr () +foreign label "ErrorHdrHook" errorHdrHook :: Ptr () foreign import ccall "writeErrString__" unsafe writeErrString :: Ptr () -> CString -> Int -> IO () -- 1.7.10.4