projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2000-07-03 20:34:35 by panne]
[ghc-hetmet.git]
/
ghc
/
rts
/
Main.c
diff --git
a/ghc/rts/Main.c
b/ghc/rts/Main.c
index
a90556e
..
f66ecdf
100644
(file)
--- 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
*
*
* (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
*/
/* 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;
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:
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:
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);
barf("main thread completed with invalid status");
}
shutdownHaskellAndExit(exit_status);
+ return 0; /* never reached, keep gcc -Wall happy */
}
# endif /* BATCH_MODE */
}
# endif /* BATCH_MODE */