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-03-14 09:55:05 by simonmar]
[ghc-hetmet.git]
/
ghc
/
rts
/
Main.c
diff --git
a/ghc/rts/Main.c
b/ghc/rts/Main.c
index
8dc044a
..
e5e00c7
100644
(file)
--- a/
ghc/rts/Main.c
+++ b/
ghc/rts/Main.c
@@
-1,7
+1,7
@@
/* -----------------------------------------------------------------------------
/* -----------------------------------------------------------------------------
- * $Id: Main.c,v 1.15 2000/01/14 13:17:16 hwloidl Exp $
+ * $Id: Main.c,v 1.18 2000/03/14 09:55:05 simonmar Exp $
*
*
- * (c) The GHC Team 1998-1999
+ * (c) The GHC Team 1998-2000
*
* Main function for a standalone Haskell program.
*
*
* Main function for a standalone Haskell program.
*
@@
-14,6
+14,7
@@
#include "SchedAPI.h"
#include "RtsFlags.h"
#include "RtsUtils.h"
#include "SchedAPI.h"
#include "RtsFlags.h"
#include "RtsUtils.h"
+#include "Prelude.h"
#ifdef DEBUG
# include "Printer.h" /* for printing */
#ifdef DEBUG
# include "Printer.h" /* for printing */
@@
-79,7
+80,7
@@
int main(int argc, char *argv[])
fprintf(stderr, "Main Thread Started ...\n");
/* ToDo: Dump event for the main thread */
fprintf(stderr, "Main Thread Started ...\n");
/* ToDo: Dump event for the main thread */
- status = rts_evalIO((StgClosure *)&mainIO_closure, NULL);
+ status = rts_evalIO(mainIO_closure, NULL);
} else {
/* Just to show we're alive */
IF_PAR_DEBUG(verbose,
} else {
/* Just to show we're alive */
IF_PAR_DEBUG(verbose,
@@
-93,12
+94,12
@@
int main(int argc, char *argv[])
# elif defined(GRAN)
/* ToDo: Dump event for the main thread */
# elif defined(GRAN)
/* ToDo: Dump event for the main thread */
- status = rts_evalIO((StgClosure *)&mainIO_closure, NULL);
+ status = rts_evalIO(mainIO_closure, NULL);
# else /* !PAR && !GRAN */
/* ToDo: want to start with a larger stack size */
# else /* !PAR && !GRAN */
/* ToDo: want to start with a larger stack size */
- status = rts_evalIO((StgClosure *)&mainIO_closure, NULL);
+ status = rts_evalIO((StgClosure *)mainIO_closure, NULL);
# endif /* !PAR && !GRAN */
# endif /* !PAR && !GRAN */
@@
-120,8
+121,8
@@
int main(int argc, char *argv[])
case Success:
exit_status = EXIT_SUCCESS;
break;
case Success:
exit_status = EXIT_SUCCESS;
break;
- case NoStatus:
- barf("main thread completed with no status");
+ default:
+ barf("main thread completed with invalid status");
}
shutdownHaskellAndExit(exit_status);
}
}
shutdownHaskellAndExit(exit_status);
}