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 /includes/stg | |
| 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 'includes/stg')
| -rw-r--r-- | includes/stg/MiscClosures.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/includes/stg/MiscClosures.h b/includes/stg/MiscClosures.h index 9b4949fbd6..6fd7181426 100644 --- a/includes/stg/MiscClosures.h +++ b/includes/stg/MiscClosures.h @@ -25,14 +25,14 @@ # define RTS_FUN_INFO(i) extern W_(i)[] # define RTS_THUNK_INFO(i) extern W_(i)[] # define RTS_INFO(i) extern W_(i)[] -# define RTS_CLOSURE(i) extern W_(i ## _static_closure)[] +# define RTS_CLOSURE(i) extern W_(i)[] # define RTS_FUN_DECL(f) extern DLL_IMPORT_RTS StgFunPtr f(void) #else # define RTS_RET_INFO(i) extern DLL_IMPORT_RTS const StgRetInfoTable i # define RTS_FUN_INFO(i) extern DLL_IMPORT_RTS const StgFunInfoTable i # define RTS_THUNK_INFO(i) extern DLL_IMPORT_RTS const StgThunkInfoTable i # define RTS_INFO(i) extern DLL_IMPORT_RTS const StgInfoTable i -# define RTS_CLOSURE(i) extern DLL_IMPORT_RTS StgClosure i ## _static_closure +# define RTS_CLOSURE(i) extern DLL_IMPORT_RTS StgClosure i # define RTS_FUN_DECL(f) extern DLL_IMPORT_RTS StgFunPtr f(void) #endif @@ -148,25 +148,25 @@ RTS_ENTRY(stg_NO_TREC); /* closures */ -RTS_CLOSURE(stg_END_TSO_QUEUE); -RTS_CLOSURE(stg_STM_AWOKEN); -RTS_CLOSURE(stg_NO_FINALIZER); -RTS_CLOSURE(stg_dummy_ret); -RTS_CLOSURE(stg_forceIO); +RTS_CLOSURE(stg_END_TSO_QUEUE_closure); +RTS_CLOSURE(stg_STM_AWOKEN_closure); +RTS_CLOSURE(stg_NO_FINALIZER_closure); +RTS_CLOSURE(stg_dummy_ret_closure); +RTS_CLOSURE(stg_forceIO_closure); -RTS_CLOSURE(stg_END_STM_WATCH_QUEUE); -RTS_CLOSURE(stg_END_INVARIANT_CHECK_QUEUE); -RTS_CLOSURE(stg_END_STM_CHUNK_LIST); -RTS_CLOSURE(stg_NO_TREC); +RTS_CLOSURE(stg_END_STM_WATCH_QUEUE_closure); +RTS_CLOSURE(stg_END_INVARIANT_CHECK_QUEUE_closure); +RTS_CLOSURE(stg_END_STM_CHUNK_LIST_closure); +RTS_CLOSURE(stg_NO_TREC_closure); RTS_ENTRY(stg_NO_FINALIZER_entry); #if IN_STG_CODE -extern DLL_IMPORT_RTS StgWordArray stg_CHARLIKE_static_closure; -extern DLL_IMPORT_RTS StgWordArray stg_INTLIKE_static_closure; +extern DLL_IMPORT_RTS StgWordArray stg_CHARLIKE_closure; +extern DLL_IMPORT_RTS StgWordArray stg_INTLIKE_closure; #else -extern DLL_IMPORT_RTS StgIntCharlikeClosure stg_CHARLIKE_static_closure[]; -extern DLL_IMPORT_RTS StgIntCharlikeClosure stg_INTLIKE_static_closure[]; +extern DLL_IMPORT_RTS StgIntCharlikeClosure stg_CHARLIKE_closure[]; +extern DLL_IMPORT_RTS StgIntCharlikeClosure stg_INTLIKE_closure[]; #endif /* StgStartup */ |