diff options
| author | Edward Z. Yang <ezyang@cs.stanford.edu> | 2014-10-20 15:57:13 -0700 |
|---|---|---|
| committer | Edward Z. Yang <ezyang@cs.stanford.edu> | 2014-10-20 16:28:42 -0700 |
| commit | 89a8d817f0c2951ec305c286a526205d06bf9221 (patch) | |
| tree | 5295cab951600148bd83f1cae0ae5250816dc257 /rts/STM.h | |
| parent | 0202b7cefbaf76dc53d43562dbc84a52debe2eb2 (diff) | |
| download | haskell-89a8d817f0c2951ec305c286a526205d06bf9221.tar.gz | |
Revert "Rename _closure to _static_closure, apply naming consistently."
This reverts commit 35672072b4091d6f0031417bc160c568f22d0469.
Conflicts:
compiler/main/DriverPipeline.hs
Diffstat (limited to 'rts/STM.h')
| -rw-r--r-- | rts/STM.h | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -209,11 +209,11 @@ void stmWriteTVar(Capability *cap, /* NULLs */ -#define END_STM_WATCH_QUEUE ((StgTVarWatchQueue *)stg_END_STM_WATCH_QUEUE_closure) -#define END_INVARIANT_CHECK_QUEUE ((StgInvariantCheckQueue *)stg_END_INVARIANT_CHECK_QUEUE_closure) -#define END_STM_CHUNK_LIST ((StgTRecChunk *)stg_END_STM_CHUNK_LIST_closure) +#define END_STM_WATCH_QUEUE ((StgTVarWatchQueue *)(void *)&stg_END_STM_WATCH_QUEUE_closure) +#define END_INVARIANT_CHECK_QUEUE ((StgInvariantCheckQueue *)(void *)&stg_END_INVARIANT_CHECK_QUEUE_closure) +#define END_STM_CHUNK_LIST ((StgTRecChunk *)(void *)&stg_END_STM_CHUNK_LIST_closure) -#define NO_TREC ((StgTRecHeader *)stg_NO_TREC_closure) +#define NO_TREC ((StgTRecHeader *)(void *)&stg_NO_TREC_closure) /*----------------------------------------------------------------------*/ |