diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2020-01-26 09:29:57 +0000 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-01-27 10:04:19 -0500 |
| commit | 97d0b0a367e4c6a52a17c3299439ac7de129da24 (patch) | |
| tree | ac71f946252011fe0ac7674d64c3cab2cace369c /includes | |
| parent | 1132602f764ef4694b52abeaeeaa8da544915134 (diff) | |
| download | haskell-97d0b0a367e4c6a52a17c3299439ac7de129da24.tar.gz | |
Make Block.h compile with c++ compilers
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/rts/storage/Block.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/includes/rts/storage/Block.h b/includes/rts/storage/Block.h index 4afc3689cb..626cddb2a2 100644 --- a/includes/rts/storage/Block.h +++ b/includes/rts/storage/Block.h @@ -84,10 +84,18 @@ // freely modified. #if !defined(CMINUSMINUS) + + +struct NonmovingSegmentInfo { + StgWord8 log_block_size; + StgWord16 next_free_snap; +}; + typedef struct bdescr_ { StgPtr start; // [READ ONLY] start addr of memory + union { StgPtr free; // First free byte of memory. // allocGroup() sets this to the value of start. @@ -100,10 +108,7 @@ typedef struct bdescr_ { // indicate that a block is unallocated. // // Unused by the non-moving allocator. - struct NonmovingSegmentInfo { - StgWord8 log_block_size; - StgWord16 next_free_snap; - } nonmoving_segment; + struct NonmovingSegmentInfo nonmoving_segment; }; struct bdescr_ *link; // used for chaining blocks together |