From: simonmar Date: Tue, 18 Jan 2000 12:36:38 +0000 (+0000) Subject: [project @ 2000-01-18 12:36:38 by simonmar] X-Git-Tag: Approximately_9120_patches~5266 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=5fec2547a787bdf4a8867cd000b2816b81204d69;p=ghc-hetmet.git [project @ 2000-01-18 12:36:38 by simonmar] non-functional changes that were sitting in my tree. --- diff --git a/ghc/includes/Closures.h b/ghc/includes/Closures.h index 1de91ef..85d8704 100644 --- a/ghc/includes/Closures.h +++ b/ghc/includes/Closures.h @@ -1,5 +1,5 @@ /* ---------------------------------------------------------------------------- - * $Id: Closures.h,v 1.15 2000/01/13 14:34:00 hwloidl Exp $ + * $Id: Closures.h,v 1.16 2000/01/18 12:36:38 simonmar Exp $ * * (c) The GHC Team, 1998-1999 * @@ -117,7 +117,7 @@ typedef struct { #ifdef PAR StgParHeader par; #endif -#if defined(GRAN) +#ifdef GRAN StgGranHeader gran; #endif #ifdef TICKY_TICKY @@ -273,7 +273,7 @@ typedef struct _StgStableName { StgHeader header; StgWord sn; } StgStableName; - + typedef struct _StgWeak { /* Weak v */ StgHeader header; StgClosure *key; @@ -325,9 +325,9 @@ typedef struct StgBlockingQueueElement_ { } StgBlockingQueueElement; typedef struct StgBlockingQueue_ { - StgHeader header; - struct StgBlockingQueueElement_ *blocking_queue; - StgMutClosure *mut_link; + StgHeader header; + struct StgBlockingQueueElement_ *blocking_queue; + StgMutClosure *mut_link; } StgBlockingQueue; /* this closure is hanging at the end of a blocking queue in (par setup only) */ @@ -343,12 +343,13 @@ typedef struct StgRBH_ { } StgRBH; #else -/* old sequential version of a blocking queue, which can only hold TSOs */ + typedef struct StgBlockingQueue_ { - StgHeader header; - struct StgTSO_ *blocking_queue; - StgMutClosure *mut_link; + StgHeader header; + struct StgTSO_ *blocking_queue; + StgMutClosure *mut_link; } StgBlockingQueue; + #endif #if defined(PAR)