diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2016-11-30 10:54:45 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2016-11-30 10:56:10 -0500 |
| commit | e2330b6dde805a5507898c3c4ddf38599df969da (patch) | |
| tree | d52c52b99f510553b2d1733d006747d75be68a6d /includes | |
| parent | 03766cdbd26855e50719bd8ffcaf19898bd33f16 (diff) | |
| download | haskell-e2330b6dde805a5507898c3c4ddf38599df969da.tar.gz | |
Revert "Make globals use sharedCAF"
This reverts commit 6f7ed1e51bf360621a3c2a447045ab3012f68575 due to breakage of
the build on Windows.
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/rts/Globals.h | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/includes/rts/Globals.h b/includes/rts/Globals.h index e3ff643556..00553610f5 100644 --- a/includes/rts/Globals.h +++ b/includes/rts/Globals.h @@ -17,23 +17,14 @@ #ifndef RTS_GLOBALS_H #define RTS_GLOBALS_H -#define mkStoreAccessorPrototype(name) \ - StgStablePtr \ - getOrSet##name(StgStablePtr ptr); - -mkStoreAccessorPrototype(GHCConcSignalSignalHandlerStore) -mkStoreAccessorPrototype(GHCConcWindowsPendingDelaysStore) -mkStoreAccessorPrototype(GHCConcWindowsIOManagerThreadStore) -mkStoreAccessorPrototype(GHCConcWindowsProddingStore) -mkStoreAccessorPrototype(SystemEventThreadEventManagerStore) -mkStoreAccessorPrototype(SystemEventThreadIOManagerThreadStore) -mkStoreAccessorPrototype(SystemTimerThreadEventManagerStore) -mkStoreAccessorPrototype(SystemTimerThreadIOManagerThreadStore) -mkStoreAccessorPrototype(LibHSghcFastStringTable) -mkStoreAccessorPrototype(LibHSghcPersistentLinkerState) -mkStoreAccessorPrototype(LibHSghcInitLinkerDone) -mkStoreAccessorPrototype(LibHSghcGlobalDynFlags) -mkStoreAccessorPrototype(LibHSghcStaticOptions) -mkStoreAccessorPrototype(LibHSghcStaticOptionsReady) +StgStablePtr getOrSetGHCConcSignalSignalHandlerStore(StgStablePtr value); +StgStablePtr getOrSetGHCConcWindowsPendingDelaysStore(StgStablePtr ptr); +StgStablePtr getOrSetGHCConcWindowsIOManagerThreadStore(StgStablePtr ptr); +StgStablePtr getOrSetGHCConcWindowsProddingStore(StgStablePtr ptr); +StgStablePtr getOrSetSystemEventThreadEventManagerStore(StgStablePtr ptr); +StgStablePtr getOrSetSystemEventThreadIOManagerThreadStore(StgStablePtr ptr); +StgStablePtr getOrSetSystemTimerThreadEventManagerStore(StgStablePtr ptr); +StgStablePtr getOrSetSystemTimerThreadIOManagerThreadStore(StgStablePtr ptr); +StgStablePtr getOrSetLibHSghcFastStringTable(StgStablePtr ptr); #endif /* RTS_GLOBALS_H */ |