summaryrefslogtreecommitdiff
path: root/includes/rts/storage/Block.h
diff options
context:
space:
mode:
authorHerbert Valerio Riedel <hvr@gnu.org>2014-01-19 14:37:05 +0100
committerHerbert Valerio Riedel <hvr@gnu.org>2014-01-19 14:43:38 +0100
commitfe3740bd931ca30c22d956816f71be9026eeef54 (patch)
treea364a13241602a3a5e94d54c5c585711208d5ebe /includes/rts/storage/Block.h
parent1ad599ea241626f47006fa386e4aaf38dc91fdbb (diff)
downloadhaskell-fe3740bd931ca30c22d956816f71be9026eeef54.tar.gz
Make `#include "Rts.h"` C++-compatible again (re #8676)
Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>
Diffstat (limited to 'includes/rts/storage/Block.h')
-rw-r--r--includes/rts/storage/Block.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/includes/rts/storage/Block.h b/includes/rts/storage/Block.h
index 7b3bc991d3..5567bf455a 100644
--- a/includes/rts/storage/Block.h
+++ b/includes/rts/storage/Block.h
@@ -248,17 +248,17 @@ dbl_link_insert_after(bdescr *bd, bdescr *after)
}
INLINE_HEADER void
-dbl_link_replace(bdescr *new, bdescr *old, bdescr **list)
+dbl_link_replace(bdescr *new_, bdescr *old, bdescr **list)
{
- new->link = old->link;
- new->u.back = old->u.back;
+ new_->link = old->link;
+ new_->u.back = old->u.back;
if (old->link) {
- old->link->u.back = new;
+ old->link->u.back = new_;
}
if (old->u.back) {
- old->u.back->link = new;
+ old->u.back->link = new_;
} else {
- *list = new;
+ *list = new_;
}
}