diff options
author | Matthew Pickering <matthewtpickering@gmail.com> | 2020-01-26 09:29:57 +0000 |
---|---|---|
committer | Cheng Shao <cheng.shao@tweag.io> | 2021-10-14 12:53:29 +0000 |
commit | 8a4f1d2266f3c0c54d634bf2c4ac1bda01c9a456 (patch) | |
tree | 5dee7b24d7e78e996cc596adedf790a3e954918a | |
parent | c1b850dd6ee8a7a6814c894bf3cf9e04195d9bef (diff) | |
download | haskell-8a4f1d2266f3c0c54d634bf2c4ac1bda01c9a456.tar.gz |
Make Block.h compile with c++ compilers
(cherry picked from commit 97d0b0a367e4c6a52a17c3299439ac7de129da24)
-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 |