Merge branch 'as/diff-options-grammofix'

diff --git a/oidset.c b/oidset.c
index ac169f05d3ab1bde7391f15ae58743d6ceafbad5..a6a08ba52abdcda75b0bd5cc28349cd3c4be871c 100644 (file)
--- a/oidset.c
+++ b/oidset.c
@@ -6,7 +6,8 @@ struct oidset_entry {
        struct object_id oid;
 };
 
-static int oidset_hashcmp(const void *va, const void *vb,
+static int oidset_hashcmp(const void *unused_cmp_data,
+                         const void *va, const void *vb,
                          const void *vkey)
 {
        const struct oidset_entry *a = va, *b = vb;
@@ -30,7 +31,7 @@ int oidset_insert(struct oidset *set, const struct object_id *oid)
        struct oidset_entry *entry;
 
        if (!set->map.cmpfn)
-               hashmap_init(&set->map, oidset_hashcmp, 0);
+               hashmap_init(&set->map, oidset_hashcmp, NULL, 0);
 
        if (oidset_contains(set, oid))
                return 1;