Merge Makefile rewrite into master

[ccan] / ccan / strmap / test / run-prefix.c

diff --git a/ccan/strmap/test/run-prefix.c b/ccan/strmap/test/run-prefix.c
index 9c5156e6e57dd8c7ba09d85a1ca43138341497b8..6232d71b26135106016d22a01f84feee45c988ca 100644 (file)
--- a/ccan/strmap/test/run-prefix.c
+++ b/ccan/strmap/test/run-prefix.c
@@ -15,7 +15,7 @@ static bool in_order(const char *index, char *value, unsigned int *count)
        return true;
 }
 
-static bool find_empty(const char *index, char *value, char *empty)
+static bool find_empty(const char *index, char *value UNNEEDED, char *empty)
 {
        if (index == empty)
                pass("Found empty entry!");
@@ -24,11 +24,9 @@ static bool find_empty(const char *index, char *value, char *empty)
 
 int main(void)
 {
-       struct map {
-               STRMAP_MEMBERS(char *);
-       };
-       struct map map;
-       const struct map *sub;
+       typedef STRMAP(char *) map_t;
+       map_t map;
+       const map_t *sub;
        unsigned int i;
        char *str[NUM], *empty;
 
@@ -56,9 +54,9 @@ int main(void)
 
        /* Everything */
        sub = strmap_prefix(&map, "0");
-       ok1(sub->raw.u.n == map.raw.u.n);
+       ok1(tcon_unwrap(sub)->u.n == tcon_unwrap(&map)->u.n);
        sub = strmap_prefix(&map, "");
-       ok1(sub->raw.u.n == map.raw.u.n);
+       ok1(tcon_unwrap(sub)->u.n == tcon_unwrap(&map)->u.n);
 
        /* Single. */
        sub = strmap_prefix(&map, "00000000");