diff options
| -rw-r--r-- | ghc/includes/StgStorage.h | 6 | ||||
| -rw-r--r-- | ghc/rts/Storage.h | 6 |
2 files changed, 3 insertions, 9 deletions
diff --git a/ghc/includes/StgStorage.h b/ghc/includes/StgStorage.h index 11cca7033e..5c0ca12a51 100644 --- a/ghc/includes/StgStorage.h +++ b/ghc/includes/StgStorage.h @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------------- - * $Id: StgStorage.h,v 1.11 2001/11/08 12:46:31 simonmar Exp $ + * $Id: StgStorage.h,v 1.12 2003/03/26 17:40:58 sof Exp $ * * (c) The GHC Team, 1998-1999 * @@ -96,10 +96,6 @@ typedef struct _generation { CloseNursery(hp) Closes the allocation area. - PleaseStopAllocating(void) Arranges that the next call to - ExtendNursery() will fail, triggering - a return to the scheduler. This is - useful for asynchronous interupts etc. -------------------------------------------------------------------------- */ #define OpenNursery(hp,hplim) \ diff --git a/ghc/rts/Storage.h b/ghc/rts/Storage.h index dc86e0275f..12f9982c52 100644 --- a/ghc/rts/Storage.h +++ b/ghc/rts/Storage.h @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------------- - * $Id: Storage.h,v 1.49 2003/03/24 14:46:57 simonmar Exp $ + * $Id: Storage.h,v 1.50 2003/03/26 17:40:57 sof Exp $ * * (c) The GHC Team, 1998-2002 * @@ -78,14 +78,12 @@ doYouWantToGC( void ) -------------------------------------------------------------------------- */ #define ExtendNursery(hp,hplim) \ - (CurrentNursery->free = (P_)(hp)+1, \ + (CloseNursery(hp), \ CurrentNursery->link == NULL ? rtsFalse : \ (CurrentNursery = CurrentNursery->link, \ OpenNursery(hp,hplim), \ rtsTrue)) -extern void PleaseStopAllocating(void); - /* ----------------------------------------------------------------------------- Performing Garbage Collection |