diff options
| author | Ian Lynagh <ian@well-typed.com> | 2013-06-22 13:50:59 +0100 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2013-06-22 13:50:59 +0100 |
| commit | f792ba4d34222fd19dd59ea7a9d2665547875fec (patch) | |
| tree | e8183e6b1fc4742d773497123958e931e1715f1c | |
| parent | 451e0dd875274aeb492a681bcdf944ab6deac39f (diff) | |
| parent | ffe2e22c11518994108f1f319764fe898e899086 (diff) | |
| download | haskell-f792ba4d34222fd19dd59ea7a9d2665547875fec.tar.gz | |
Merge branch 'master' of http://darcs.haskell.org/ghc
| -rw-r--r-- | includes/stg/MiscClosures.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/includes/stg/MiscClosures.h b/includes/stg/MiscClosures.h index ca5280f188..8717687f3e 100644 --- a/includes/stg/MiscClosures.h +++ b/includes/stg/MiscClosures.h @@ -98,6 +98,7 @@ RTS_FUN(stg_BCO); RTS_ENTRY(stg_EVACUATED); RTS_ENTRY(stg_WEAK); RTS_ENTRY(stg_DEAD_WEAK); +RTS_ENTRY(stg_C_FINALIZER_LIST); RTS_ENTRY(stg_STABLE_NAME); RTS_ENTRY(stg_MVAR_CLEAN); RTS_ENTRY(stg_MVAR_DIRTY); @@ -483,6 +484,9 @@ extern StgWord CCS_SYSTEM[]; extern unsigned int RTS_VAR(CC_ID); /* global ids */ extern unsigned int RTS_VAR(CCS_ID); +// Capability.c +extern unsigned int n_capabilities; + #endif #endif /* STGMISCCLOSURES_H */ |