From: Theodore Ts'o Date: Sat, 18 May 2024 05:00:14 +0000 (-0400) Subject: libext2fs: avoid using a C++ reserved identifier in rbtree.h X-Git-Tag: v1.47.1-wc1~122 X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=d17f167c294ccbf6ee75ad9beefcfe2581d04904;p=tools%2Fe2fsprogs.git libext2fs: avoid using a C++ reserved identifier in rbtree.h Signed-off-by: Theodore Ts'o --- diff --git a/lib/ext2fs/rbtree.h b/lib/ext2fs/rbtree.h index 790f5c1..b96e6f2 100644 --- a/lib/ext2fs/rbtree.h +++ b/lib/ext2fs/rbtree.h @@ -163,7 +163,7 @@ extern struct rb_node *ext2fs_rb_first(const struct rb_root *); extern struct rb_node *ext2fs_rb_last(const struct rb_root *); /* Fast replacement of a single node without remove/rebalance/add/rebalance */ -extern void ext2fs_rb_replace_node(struct rb_node *victim, struct rb_node *new, +extern void ext2fs_rb_replace_node(struct rb_node *victim, struct rb_node *new_, struct rb_root *root); static inline void ext2fs_rb_link_node(struct rb_node * node,