projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 1999-02-11 17:40:23 by simonm]
[ghc-hetmet.git]
/
ghc
/
rts
/
RtsStartup.c
diff --git
a/ghc/rts/RtsStartup.c
b/ghc/rts/RtsStartup.c
index
e075c9d
..
bd09db7
100644
(file)
--- a/
ghc/rts/RtsStartup.c
+++ b/
ghc/rts/RtsStartup.c
@@
-1,5
+1,7
@@
/* -----------------------------------------------------------------------------
/* -----------------------------------------------------------------------------
- * $Id: RtsStartup.c,v 1.2 1998/12/02 13:28:41 simonm Exp $
+ * $Id: RtsStartup.c,v 1.7 1999/02/11 17:40:27 simonm Exp $
+ *
+ * (c) The GHC Team, 1998-1999
*
* Main function for a standalone Haskell program.
*
*
* Main function for a standalone Haskell program.
*
@@
-10,13
+12,14
@@
#include "RtsUtils.h"
#include "RtsFlags.h"
#include "Storage.h" /* initStorage, exitStorage */
#include "RtsUtils.h"
#include "RtsFlags.h"
#include "Storage.h" /* initStorage, exitStorage */
-#include "StablePtr.h" /* initStablePtrTable */
+#include "StablePriv.h" /* initStablePtrTable */
#include "Schedule.h" /* initScheduler */
#include "Stats.h" /* initStats */
#include "Weak.h"
#include "Schedule.h" /* initScheduler */
#include "Stats.h" /* initStats */
#include "Weak.h"
+#include "Ticky.h"
#if defined(PROFILING)
#if defined(PROFILING)
-# include "ProfRTS.h"
+# include "ProfRts.h"
#elif defined(DEBUG)
# include "DebugProf.h"
#endif
#elif defined(DEBUG)
# include "DebugProf.h"
#endif
@@
-111,8
+114,8
@@
extern void startupHaskell(int argc, char *argv[])
void
shutdownHaskell(void)
{
void
shutdownHaskell(void)
{
- /* Finalise any remaining weak pointers */
- finaliseWeakPointersNow();
+ /* Finalize any remaining weak pointers */
+ finalizeWeakPointersNow();
#if defined(GRAN)
#error FixMe.
#if defined(GRAN)
#error FixMe.
@@
-132,8
+135,7
@@
shutdownHaskell(void)
#endif
#if defined(TICKY_TICKY)
#endif
#if defined(TICKY_TICKY)
- #error FixMe.
- if (RTSflags.TickyFlags.showTickyStats) PrintTickyInfo();
+ if (RtsFlags.TickyFlags.showTickyStats) PrintTickyInfo();
#endif
/*
#endif
/*