[project @ 2000-09-11 15:02:51 by rrt]

[ghc-hetmet.git] / ghc / rts / Main.c

diff --git a/ghc/rts/Main.c b/ghc/rts/Main.c
index f911304..f66ecdf 100644 (file)
--- a/ghc/rts/Main.c
+++ b/ghc/rts/Main.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Main.c,v 1.20 2000/03/31 03:09:36 hwloidl Exp $
+ * $Id: Main.c,v 1.25 2000/06/25 17:25:42 panne Exp $
  *
  * (c) The GHC Team 1998-2000
  *
@@ -38,19 +38,19 @@
 # include <windows.h>
 #endif
 
-EXTFUN(__init_Main);
+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;
     SchedulerStatus status;
     /* all GranSim/GUM init is done in startupHaskell; sets IAmMainThread! */
 
-    startupHaskell(argc,argv,__init_Main);
+    startupHaskell(argc,argv,__init_PrelMain);
 
     /* kick off the computation by creating the main thread with a pointer
        to mainIO_closure representing the computation of the overall program;
@@ -100,7 +100,7 @@ int main(int argc, char *argv[])
 #  else /* !PAR && !GRAN */
 
     /* ToDo: want to start with a larger stack size */
-    status = rts_evalIO(mainIO_closure, NULL);
+    status = rts_evalIO((HaskellObj)mainIO_closure, NULL);
 
 #  endif /* !PAR && !GRAN */
 
@@ -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 */