Merge branch 'tr/maint-bundle-boundary' into maint

diff --git a/vcs-svn/string_pool.c b/vcs-svn/string_pool.c
index f5b1da836e01bd17254b50ab3c88bae01eee200d..1b63b19a383c570f69b9456c66170e592c49d9ba 100644 (file)
--- a/vcs-svn/string_pool.c
+++ b/vcs-svn/string_pool.c
@@ -8,7 +8,7 @@
 #include "obj_pool.h"
 #include "string_pool.h"
 
-static struct trp_root tree = { ~0 };
+static struct trp_root tree = { ~0U };
 
 struct node {
        uint32_t offset;
@@ -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)
 {
@@ -78,7 +78,7 @@ void pool_print_seq(uint32_t len, uint32_t *seq, char delim, FILE *stream)
 uint32_t pool_tok_seq(uint32_t sz, uint32_t *seq, const char *delim, char *str)
 {
        char *context = NULL;
-       uint32_t token = ~0;
+       uint32_t token = ~0U;
        uint32_t length;
 
        if (sz == 0)