merge-recursive: Cleanup and consolidation of rename_conflict_info

diff --git a/vcs-svn/string_pool.c b/vcs-svn/string_pool.c
index f5b1da836e01bd17254b50ab3c88bae01eee200d..8af8d54d6ef41a2e84e500bd0d1a5523e59f8a32 100644 (file)
--- a/vcs-svn/string_pool.c
+++ b/vcs-svn/string_pool.c
@@ -30,7 +30,7 @@ static int node_cmp(struct node *a, struct node *b)
 }
 
 /* Build a Treap from the node structure (a trp_node w/ offset) */
-trp_gen(static, tree_, struct node, children, node, node_cmp);
+trp_gen(static, tree_, struct node, children, node, node_cmp)
 
 const char *pool_fetch(uint32_t entry)
 {