X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FMain.c;h=f66ecdf44ec27eb5bd46689f4b67203e4de3ef5a;hb=dc9cf6cfaa28078e86d250bbf17acb3008ce30fb;hp=a90556eae29ce29a00b410bb66f16e78b15d4dac;hpb=b74c1ccfae2bea6d80a7d1e658565ec87b221313;p=ghc-hetmet.git diff --git a/ghc/rts/Main.c b/ghc/rts/Main.c index a90556e..f66ecdf 100644 --- a/ghc/rts/Main.c +++ b/ghc/rts/Main.c @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------------- - * $Id: Main.c,v 1.22 2000/04/03 16:26:01 simonmar Exp $ + * $Id: Main.c,v 1.25 2000/06/25 17:25:42 panne Exp $ * * (c) The GHC Team 1998-2000 * @@ -43,7 +43,7 @@ EXTFUN(__init_PrelMain); /* Hack: we assume that we're building a batch-mode system unless * INTERPRETER is set */ -# ifndef INTERPRETER /* Hack */ +#ifndef INTERPRETER /* Hack */ int main(int argc, char *argv[]) { int exit_status; @@ -112,7 +112,7 @@ int main(int argc, char *argv[]) exit_status = EXIT_DEADLOCK; break; case Killed: - prog_belch("main thread killed"); + prog_belch("main thread exited (uncaught exception)"); exit_status = EXIT_KILLED; break; case Interrupted: @@ -126,5 +126,6 @@ int main(int argc, char *argv[]) barf("main thread completed with invalid status"); } shutdownHaskellAndExit(exit_status); + return 0; /* never reached, keep gcc -Wall happy */ } # endif /* BATCH_MODE */